RAT-273: Simplify test setup