Added test to question_spec.rb
Merge branch 'master' into questions