Fixed for Mongos handling to ensure correct passing of test suites