improve test class