Added Gems for testing and Model Tests.
Changed cohorts json to reflect new column names in DB.
Updated controller to reflect new DB table names.
Merge