Added map unit tests