CONN-443: Fix for unit test failures.