Improve test coverage and expand replacement table#14

mit-d merged 2 commits intomainmit-d/check-unicode:mainfrom

refactor/test-improvementsmit-d/check-unicode:refactor/test-improvementsCopy head branch name to clipboard