Merge remote-tracking branch 'origin' into v3

.circleci/config.yml

 
 version: 2
 jobs:
-  ios_e2e:
+  ios:
     macos:
       xcode: "10.2.1"
     steps:
@@ -12,10 +12,13 @@ jobs:
       - run:
           name: npm install
           command: npm install
+      - run:
+          name: iOS unit tests
+          command: 'npm run test-unit-ios'
       - run:
           name: Detox iOS e2e tests
           command: 'npm run test-e2e-ios-release'
-  android_unit:
+  android:
     macos:
       xcode: "10.2.1"
     steps:
@@ -29,21 +32,9 @@ jobs:
       - run:
           name: Android unit tests
           command: 'npm run test-unit-android'
-  ios_unit:
-    macos:
-      xcode: "10.2.1"
-    steps:
-      - checkout
-      - run:
-          name: npm install
-          command: npm install
-      - run:
-          name: iOS unit tests
-          command: 'npm run test-unit-ios'
 workflows:
   version: 2	
-  test_all:
+  test:
     jobs:
-      - ios_e2e	
-      - android_unit
-      - ios_unit
\ No newline at end of file
+      - ios	
+      - android
\ No newline at end of file