removed map bug
Tests. very important addition. let's see how coverage improved