More iOS unit test fixes