More tests puzzles
Didn't change filename name properly
merged in new puzzles from master