Added question model tests
Modified question tests
Added question model tests
fixed merge errors in question_spec factories and question model