Fixes issue #1770
Minor test cleanup
Merge pull request #1771 from pveentjer/fix/3.x/1770-loading-of-mapstore-for-statistics

Fixes issue #1770