Class with unit tests

I worked thru the changes in the email:
cleaning up the names
removing the duplicate unittests.
Remove these two comments and do an actual check in the __init__ method. (see above)