Added Tests for new Maps...