clean up of classes, additional tests