Modified test class