Unit tests fixed.