Extended test suite to provide seperate test classes for each class to test