Refined and added test questions.