Trying to fix tests for Travis