Got tests working for key schema removal