clean up Dvi, add a test case