Cleanups before PR.  Added new tests