[#524] (rm, ogl) Refactored MapClusterTest to improve clarity.