Updates to test scripts