Clean up tests
Fix HashMap test case memory leak