improved TestMapCollision