Some more work on the unit tests
Some test coverage tweaks