Use HashSet for test 2005
am: f1ede367e6

Change-Id: I55a85ac5865d12f8df5a5d74f3aae612f211ef1d