Attempt to fix test scripts