Fixes to pass Travis CI - tests pass locally