Fix broken unit tests
Assign Interviewers to Survey
Merge branch 'development'