Parameterize the puzzle generator tests, and cover some more scenarios.