Wan Replication fixes
Merge pull request #2006 from mesutcelik/problematic-tests

Wan Replication fixes