Last test fixes.