Change class names and separate tests