Reordered hierarchy in terrain_test