iPhone test changes
First almost working commit