Rewrite tests
Fix travis