Missing test fixes.