clean up corpus, corpus util unit tests.
Added unit tests.