Added unit testing + hashmap test