Rename and tweak test scripts.