Removed bunch of test classes