Unit test and other changes.