Fix last two travis failing tests?