Extra puzzles in TestMap_Jelle