Fix couple of skipifs when only running a ReplicaSet