Simplify test fixtures