Replication cleanup part3

Cleanup of replication test failures