Refactor Generator.user tests