Improvements to IdentificationAndCategory and unit tests.