diff --git a/library/common-test/tests/deployment/label_test.yaml b/library/common-test/tests/deployment/label_test.yaml
index e0e6a8deda..7a4e603ba3 100644
--- a/library/common-test/tests/deployment/label_test.yaml
+++ b/library/common-test/tests/deployment/label_test.yaml
@@ -2,7 +2,7 @@ suite: deployment label test
 templates:
   - common.yaml
 chart:
-  appVersion: v1.2.3
+  appVersion: &appVer v1.2.3
 tests:
   - it: should pass with default values
     documentIndex: &deploymentDoc 0
@@ -16,7 +16,7 @@ tests:
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: common-test
-            app.kubernetes.io/version: v1.2.3
+            app.kubernetes.io/version: *appVer
             helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
             release: RELEASE-NAME
@@ -52,7 +52,7 @@ tests:
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: common-test
-            app.kubernetes.io/version: v1.2.3
+            app.kubernetes.io/version: *appVer
             helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
             release: RELEASE-NAME
diff --git a/library/common-test/tests/deployment/serviceAccountName_test.yaml b/library/common-test/tests/deployment/serviceAccountName_test.yaml
index bbdd33d285..7117bc9698 100644
--- a/library/common-test/tests/deployment/serviceAccountName_test.yaml
+++ b/library/common-test/tests/deployment/serviceAccountName_test.yaml
@@ -2,8 +2,6 @@
 suite: deployment serviceAccountName
 templates:
   - common.yaml
-chart:
-  appVersion: v1.2.3
 tests:
   - it: should pass with default values
     asserts:
diff --git a/library/common-test/tests/serviceAccount/serviceAccount_test.yaml b/library/common-test/tests/serviceAccount/serviceAccount_test.yaml
index 79dba359e8..4eb51796e2 100644
--- a/library/common-test/tests/serviceAccount/serviceAccount_test.yaml
+++ b/library/common-test/tests/serviceAccount/serviceAccount_test.yaml
@@ -3,10 +3,12 @@ suite: service account
 templates:
   - common.yaml
 chart:
-  appVersion: v1.2.3
+  appVersion: &appVer v1.2.3
 tests:
   - it: should pass with default values
     asserts:
+      - hasDocuments:
+          count: 1
       - isKind:
           of: Deployment
 
@@ -25,17 +27,6 @@ tests:
           path: metadata.name
           value: RELEASE-NAME-common-test
 
-  - it: should pass (have correct serviceAccountName) with service account enabled
-    documentIndex: &deploymentDoc 1
-    set:
-      serviceAccount:
-        main:
-          enabled: true
-    asserts:
-      - equal:
-          path: spec.template.spec.serviceAccountName
-          value: RELEASE-NAME-common-test
-
   - it: should pass with primary service account enabled and nameOverride defined
     documentIndex: *serviceAccountDoc
     set:
@@ -48,18 +39,6 @@ tests:
           path: metadata.name
           value: RELEASE-NAME-common-test-some-name
 
-  - it: should pass (have correct serviceAccountName) with primary service account enabled and nameOverride defined
-    documentIndex: *deploymentDoc
-    set:
-      serviceAccount:
-        main:
-          enabled: true
-          nameOverride: some-name
-    asserts:
-      - equal:
-          path: spec.template.spec.serviceAccountName
-          value: RELEASE-NAME-common-test-some-name
-
   - it: should pass with primary service account enabled annotations and labels added
     documentIndex: *serviceAccountDoc
     set:
@@ -88,7 +67,7 @@ tests:
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: common-test
-            app.kubernetes.io/version: v1.2.3
+            app.kubernetes.io/version: *appVer
             helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
             release: RELEASE-NAME
@@ -122,7 +101,7 @@ tests:
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: common-test
-            app.kubernetes.io/version: v1.2.3
+            app.kubernetes.io/version: *appVer
             helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
             release: RELEASE-NAME
@@ -151,19 +130,3 @@ tests:
       - equal:
           path: metadata.name
           value: RELEASE-NAME-common-test-some-name
-
-  - it: should pass (have correct serviceAccountName) with non-primary service account enabled and nameOverride defined
-    documentIndex: &deploymentDoc 2
-    set:
-      serviceAccount:
-        main:
-          enabled: true
-          primary: true
-        other:
-          enabled: true
-          primary: false
-          nameOverride: some-name
-    asserts:
-      - equal:
-          path: spec.template.spec.serviceAccountName
-          value: RELEASE-NAME-common-test