Couple more unit tests, and a little more unit test coverage