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