Added unit tests and fixed encoding for vowel marks