More iOS fixes for unit tests