Completed the remaining HashMap tests and integrated those to the main test