Bug fixes to hashmap
Added temporary test logic for hashmap

Also modified the Makefile recipe to pull in the hashmap logic
correctly.