More test fixes (some tags have changed of order)