Include changes left out from last commit; add tests for Devanagari