Simplify test structure