Try and fix the tessts for #2294