Generic test fixes