Minor fixes to tests. MultiIterator & MultiMap work. There are some unfinished optimizations in the code commented. All tests pass. Some common parts from tests have been moved.
