Merging in new tilemap tests