Added each switch option for different test questions