Failed tests fixed.