Dispose hash map is working and more test cases added.