Simplify some test class structure