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