Refs #315: More updates to quiz section to use new models