Unit tests have been fixed.