Fix key creation for context; now the properties are ordered
Remove with tests
Retract first tests