Bump up the test coverage

Added a few missing test cases and corrected a unit test
that was actually wrong.