Fixes to test scripts

Thanks, I'll fix.