Light constructors for 'map' introduced
some little changes
'entry' utility method introduced
'entry' utility method is generic
common test for non empty list added
use two types of items in list test