Terrain test enhanced