small fixes to test scripts