several test fixes