Small enhancements to test scripts