added more complicated tests for recursive mapping
changed recursive comments mapping