Integration with Travis + fixed conflits while running tests on Linux machines