rudimentary sandboxing
fix tests