Tweak build and test.sh