change from set to bag in hbm
change from set to list and rename variables to match
update test cases