Update some of the test pieces so that we can run

rspec and rake test again.  Fix code coverage as well.

Steps
0. Install a production or development admin node
1. RAILS_ENV=test bundle exec rake db:create
2. bundle exec rspec
3. bundle exec rake test

Repeat steps 2 and 3 as needed.  Most tests fail, but run.
You changed my cohore DESC to cohort ASC.  Please don't do that.