Filled in unit tests for all the methods

Also fixed HashMap slightly