CONN-642: fix for randomly failing test.
CONN-624: fixes for other failing tests identified while unit testing.
Merge pull request #604 from msweaver/CONN-642

Conn 642