Simplify test organization