test class improved