* changed order of loops
* partially revert the previous commit
* testMapDefsFootSteps: skip = 20