* Added unit tests for ConstructDDIs and for ToCanonical.