Fixes to get tests to pass with Travis