Moved tests to use non-backup scratch space