Add keys/values hashmap methods and unit tests