Added several new areas to geomask -> also adapted unit test.