resolve a few unit test coverage gaps (to be squashed).