zi -> ji
changed few entries
Added new test cases for Jaakko's fixes
Merge remote-tracking branch 'origin/library-changes'