Fix a couple minor eventual consistency issues in test_cp