Add basic tests for keyspace isolation; use polymorphism for Condition re-writing; slight tweaks to wrapper construction (no double-wrapping, for example)