remove not nessessary classes and add some test for iterator of Map