Bug fix hashmap
Modify Makefile and test framework