David's suggestion for better HashMap search, tests written, passing