More fixes for correct behavior on replicaset tests