[TEST] Move NoMergePolicyProvider into it's own class
[TEST] Ensure that all flushes happen on PeerRecovery tests