get rid of custom classes
cleanup tests