Added more variety of test questions