Increasing unit test coverage

Adding unit test coverage.  Trivial I know, but part of my self-imposed dev onboarding.