updated question and test controllers