GameMapTest improved