Adding more tests for choice questions