HCOLL-167 Created a stateless map - added tests