further test fixes