Fixing tests for Travis.