Fix pkg_diff tests
Fix test for Output_tool