Finally get travis tests to pass