Trying to fix test failures on travis, rebase later if it works