improved map-methods, adapted Test