Refactored tests, don't know what's wrong on Travis CI
Travis only runs pure unit tests now, dunno why the other ones don't work