Add support for iPod touch and add device tests for iPhone and iPod