more test fixes from u2