fixes issue #1951
fixes issue
fixes issue #1951 cleanup
fixes issue #1951 cleanup cont.
remained test code cleaning
review improvements
review improvements
introduced randomMapName method.
Merge pull request #1976 from ahmetmircik/fix1951

Fixes issue #1951