Some test fixes