Reworked replicaset tests