cleanUp test for classes, add multi class functionality