Improving test scripts
Minor cleanups