Move most update-expected logic into the process_reports module, refactor some reusable bits

Move most update-expected logic into the process_reports module, refactor some reusable bits #170