Add tests for canonical lexical representation
Cosmetic changes only