Ported tests over to new-style, removed reset_sandbox.py