Remove test and class