Fix iOS deployment target setting
Reorganise screwed-up test files