fixed bugs and unit test class method names
removed unused imports
more unit test cleanups