Fixed Travis and tests