Tests passing on all counts. Reports/deliverables validate per Type/Subtype