change from test classes to real classes