Update keypace names; only drop them if they exist
Merge pull request #66 from wikimedia/test-cleanup

Update keypace names; only drop them if they exist