CFY-1433 fix tests and update for travis