More test fixes (see #1093)