Cleaned up structure of tests for PuzzleKinds