Fix travis and tests

Fix travis and tests.