Merge pull request #453 from dgough/next

Fixed InputTest to use a map instead of vector because touch points on iOS are not sequential