Changed name of test classes to end with Test