More test fixes for the removal of <>