Fix Travis CI and unit tests :fire: