removed obsolete unit tests and moved tests to correctly named test files