Added some tests for unparse; preparation for #70