refactors tests and deletes obsolete classes