Unit tests are fixed.