Work around CanCan issue 646
Get rid of needless junk in PagesController
Fix comprehensive_questionnaire factory to actually make the subobjects children of the right parent
Remove needless stuff in controllers
Fix QuestionsController#create for Rails 3 and attr_accessible security fixes
Use the right class, knucklehead
Update functional tests for the modern world