Fix Travis and tests