RESTWS-318: Fix CohortControllerTest
Fix failing test (full rep)
RESTWS-318: Resolved conflicts and made small adjustments