Fix uniClass tool which was the real cause for [a876646efe], and add test-case for it.