Other test fixes