simplification of test class