Fixed the storing in the maps so that it is the correct hash key. Also started working on Test7 & debugging Test4