Change the tests to be sandbox agnostic