Hopefully fix tests for Travis