Fixed incorrect unittest.
Fixed several related marker-bugs.
Merge branch 'master' of https://github.com/OsmSharp/OsmSharp