Updated namespaces for tests.
Added basic implementation of a Map method.

All unit tests except ExactMatching ones are still failing.