Merge "Add Custom Tile tests" into main