Add a method to canonify_expected_reports and rework command line args