Tidy up test scripts