Fix bug in ChainedHashMap
New and improved ("functional") tests
Merge branch 'hash-retest'