Fix failing tests

Fix remaining tests that were failing on Travis CI.  I still see a few scale tests fail locally, I haven't figured those out yet.  We should take a closer look at the tests and test coverage after the upcoming release.