Improved existing tests and added new tests. Improved implementation of IndexedMapper.
Tests were improved.