More tiles, new numbering and new test map