Fixed iOS tests, cleanup.