Passes all new tests for new comorbidity extraction functions
 * new tests in test-comorbid.R covering all combinations of naming and restructuring when generating comorbidities
 * comorbid.R updated accordingly