Cleaned test scripts to be (nearly?) atomic