Adds specs for Survey, Question, and choice; also fixes bugs in models