Collation updates

Added tests for Canonical Equivalence
Added code to collator to handle contractions