Refactor the generator test to make it more use-case-y