Fixed shared function specified for map/unmap syntax, modified unit test to cover