Additional unit tests, removing unused classes