Removed hardcoded test classes