Tweak test scripts for readability