fixing travis tests from after merge