Reorganized HashMap2
Renamed several methods in HashMap2
Fully implemented HashMap2Test