various test fixes