Trying to fix travis (simplify tests)