Quiz test refactoring