Merge pull request #10457 from zenspider/squishy_test_order_dependencies

Fixed bad tests to clean up after themselves.