Fixed (hopefully) final bugs in PuzzleMakerUnitTests