Added HashMap+CharBuffer

+Clean
+Correct test outputs