Fixed TestMap