Fixed some bugs in PuzzleMakerUnitTests