Updated SaltKeep to new semantics
Got some tests working