fixups to build/test scripts