More refactoring

# Added map initializer;
# Added finder tests;
# Code cleanup.