Changed tests for broken travis build while looking for solutions