Moved test case classes to a separate file