Legacy test fixes