Cleanup and polishing of test scripts.