Class with unit tests

I worked thru the changes in the email:
cleaning up the names
removing the duplicate unittests.
clean up the imports as above