Got rid of the damn test classes