added class for new test structure