More test fixes for 5.5