tests and part of the new feature for homonym. features test is broken
Merge branch 'master' into fix_homonym
homonym cases
Fixed bugs and one broken test
Fixed broken cancel