LT-14804 Collect Words now matches entries easier
* Citation form <-> Lexeme form matching tests
* Apply refactoring from LT-14805

Change-Id: Ib65ccc7830fa205f3c5b9693dea4a25af625f7b1