Fix travis and tests