Adding some unit tests on mapfileparser

To be continued
Merge remote-tracking branch 'upstream/master'