Fix build/test scripts