Multiple test fixes