Improve testing
Fix travis error