added class based tests to master