2596 - rework test to rely on entry listeners and added recording of internal ordering of map containers