Add test for error 500; add second question handling