Add more tests, allow multi-select answers