WIP HashMap tests passing again. Need to update HashSet next.