Fixed some iOS test warnings.
Merge commit 'f9395cc379bed97d72b3d321b42d60ed94daf984' into develop