Merge branch 'jc/test-hashmap-is-still-here'

Comment fix. * jc/test-hashmap-is-still-here: test-hashmap: document why it is no longer used but still there