Fixing test case after Ammar's comments.
Merge branch 'replication'