CONN-853 Added last couple of unit tests for final coverage
Merge pull request #691 from jsmith2/CONN-853-B

CONN-853 Added last couple of unit tests for final coverage