Changes to build script to fix tests