Fix the build

Test are currently failing on master and travis.  This makes other PRs risky.  Looks like there's work in the direction of a fix on the branch new-test-repo.  I cherry picked enough of that work to get the tests passing again.