class names changed and added new test case