And fix the unit test.