Fix merge problem (duplicate lines)
Fix #2133 - make it possible to run tests on iOS Simulator with full-reset