Updates to sandbox tests.