Updates to build script to fix tests