Unit tests are now passing
Cleaniing up the test code a bit more.