finish move to map-based w/test updates (squash + rebase/merge w/master is TBD)