Some further sandboxing cleanups to tests Trying to find other issues where tests may not clean up quite properly when they are through...