Tests fixes.