Fixed both versions of ReplicationStrategy + added tests to cover token-replica generation