removed obsolete tests
finished refactoring unit tests