Improve morphological analysis and tests
Merge duplicated tests