Check map/unmap routes work on Diego

[#84949358]