Fix question test

Fixed a few things! Can give a more thorough proofreading in the morning, but all tests now pass.