Small test fixes