Cleaned up testing for Controllers and Models; nested courses into curriculums resources