Added return statement to make the comment in smoking gun validator correct
Made changes in calculated_product_test to correctly generate Cat I tests from records/results
Monkey-patched data_criteria from HDS::CQM::Measure because our data criteria is in a different place