More test.sh fixes.