Mapped Questions and Answers and updated test case