diff --git a/tests/modules/omics/test_omics.py b/tests/modules/omics/test_omics.py
index b48d40e5c..fa7fda7d4 100644
--- a/tests/modules/omics/test_omics.py
+++ b/tests/modules/omics/test_omics.py
@@ -1,145 +1,131 @@
-import pytest
+from assertpy import assert_that
 
 
-def test_create_omics_run(run1, group):
-    """
-    Tests creation of omics Run
+def delete_omics_run(client, runUri, user, group):
+    query = """
+    mutation deleteOmicsRun($input: OmicsDeleteInput!) {
+      deleteOmicsRun(input: $input)
+    }
     """
-    assert run1.runUri
-    assert run1.SamlAdminGroupName == group.name
-    assert run1.label == 'my omics run'
+    return client.query(
+        query,
+        input={
+            'runUris': [runUri],
+            'deleteFromAWS': True,
+        },
+        username=user.username,
+        groups=[group.name],
+    )
 
 
-def test_list_user_omics_runs(client, user, group, run1):
+def list_omics_runs(client, user, group, filter=None):
     query = """
-        query listOmicsRuns($filter: OmicsFilter) {
-          listOmicsRuns(filter: $filter) {
-            count
-            page
-            pages
-            hasNext
-            hasPrevious
-            nodes {
-              runUri
-              workflowUri
-              name
-              owner
-              SamlAdminGroupName
-              outputDatasetUri
-              description
-              label
-              created
-              tags
-              environment {
-                label
-                name
-                environmentUri
-                AwsAccountId
-                region
-                SamlGroupName
-              }
-              organization {
-                label
-                name
-                organizationUri
-              }
-              workflow {
-                label
-                name
-                workflowUri
-                id
-                description
-                parameterTemplate
-                type
-              }
-              status {
-                status
-                statusMessage
+            query listOmicsRuns($filter: OmicsFilter) {
+              listOmicsRuns(filter: $filter) {
+                count
+                page
+                pages
+                hasNext
+                hasPrevious
+                nodes {
+                  runUri
+                  workflowUri
+                  name
+                  owner
+                  SamlAdminGroupName
+                  outputDatasetUri
+                  description
+                  label
+                  created
+                  tags
+                  environment {
+                    label
+                    name
+                    environmentUri
+                    AwsAccountId
+                    region
+                    SamlGroupName
+                  }
+                  organization {
+                    label
+                    name
+                    organizationUri
+                  }
+                  workflow {
+                    label
+                    name
+                    workflowUri
+                    id
+                    description
+                    parameterTemplate
+                    type
+                  }
+                  status {
+                    status
+                    statusMessage
+                  }
+                }
               }
             }
-          }
-        }
-        """
+            """
 
-    response = client.query(
+    return client.query(
         query,
-        filter=None,
+        filter=filter,
         username=user.username,
         groups=[group.name],
     )
 
-    assert response.data.listOmicsRuns['count'] == 1
-    assert len(response.data.listOmicsRuns['nodes']) == 1
 
-    response = client.query(
-        query,
-        filter={'term': 'my omics'},
-        username=user.username,
-        groups=[group.name],
-    )
-    assert response.data.listOmicsRuns['count'] == 1
-    assert len(response.data.listOmicsRuns['nodes']) == 1
+def test_create_omics_run(run1, group):
+    """
+    Tests creation of omics Run
+    """
+    assert run1.runUri
+    assert run1.SamlAdminGroupName == group.name
+    assert run1.label == 'my omics run'
 
 
-def test_nopermissions_list_user_omics_runs(client, user2, group2, run1):
-    query = """
-        query listOmicsRuns($filter: OmicsFilter) {
-          listOmicsRuns(filter: $filter) {
-            count
-            page
-            pages
-            hasNext
-            hasPrevious
-            nodes {
-              runUri
-              workflowUri
-              name
-              owner
-              SamlAdminGroupName
-              outputDatasetUri
-              description
-              label
-              created
-              tags
-              environment {
-                label
-                name
-                environmentUri
-                AwsAccountId
-                region
-                SamlGroupName
-              }
-              organization {
-                label
-                name
-                organizationUri
-              }
-              workflow {
+def test_create_omics_run_unauthorized(client, user2, group2, env_fixture, workflow1, dataset1):
+    response = client.query(
+        """
+            mutation createOmicsRun($input: NewOmicsRunInput!) {
+              createOmicsRun(input: $input) {
                 label
-                name
-                workflowUri
-                id
-                description
-                parameterTemplate
-                type
-              }
-              status {
-                status
-                statusMessage
+                runUri
+                SamlAdminGroupName
               }
             }
-          }
-        }
-        """
-
-    response = client.query(
-        query,
-        filter=None,
+        """,
+        input={
+            'label': 'my omics run',
+            'SamlAdminGroupName': group2.name,
+            'environmentUri': env_fixture.environmentUri,
+            'workflowUri': workflow1.workflowUri,
+            'destination': dataset1.datasetUri,
+            'parameterTemplate': '{"something"}',
+        },
         username=user2.username,
         groups=[group2.name],
     )
-    assert response.data.listOmicsRuns['count'] == 0
-    assert len(response.data.listOmicsRuns['nodes']) == 0
+    assert_that(response.errors[0].message).contains(
+        'UnauthorizedOperation', 'CREATE_OMICS_RUN', env_fixture.environmentUri
+    )
+
+
+def test_list_user_omics_runs(client, user, group, run1):
+    response = list_omics_runs(client, user, group)
+    assert_that(response.data.listOmicsRuns['count']).is_equal_to(1)
+    assert_that(response.data.listOmicsRuns['nodes'][0]['runUri']).is_equal_to(run1.runUri)
+
+    response = list_omics_runs(client, user, group, filter={'term': 'my omics'})
+    assert_that(response.data.listOmicsRuns['count']).is_equal_to(1)
+    assert_that(response.data.listOmicsRuns['nodes'][0]['runUri']).is_equal_to(run1.runUri)
+
+
+def test_list_user_omics_runs_unauthorized(client, user2, group2, run1):
+    response = list_omics_runs(client, user2, group2)
+    assert_that(response.data.listOmicsRuns['count']).is_equal_to(0)
 
 
 def test_list_omics_workflows(client, user, group, workflow1):
@@ -201,123 +187,13 @@ def test_get_omics_workflow(client, user, group, workflow1):
     assert response.data.getOmicsWorkflow['type'] == workflow1.type
 
 
-def test_delete_omics_run_does_not_exist(client, user, group, run1):
-    query = """
-    mutation deleteOmicsRun($input: OmicsDeleteInput!) {
-      deleteOmicsRun(input: $input)
-    }
-    """
-
-    response = client.query(
-        query,
-        input={
-            'runUris': ['random-string'],
-            'deleteFromAWS': True,
-        },
-        username=user.username,
-        groups=[group.name],
-    )
-    print(response)
-    print(response.data)
-    assert not response.data.deleteOmicsRun
-
-
-def test_nopermissions_delete_omics_run(client, user2, group2, run1):
-    query = """
-    mutation deleteOmicsRun($input: OmicsDeleteInput!) {
-      deleteOmicsRun(input: $input)
-    }
-    """
-
-    response = client.query(
-        query,
-        input={
-            'runUris': [run1.runUri],
-            'deleteFromAWS': True,
-        },
-        username=user2.username,
-        groups=[group2.name],
-    )
-    print(response)
-    print(response.data)
-    assert not response.data.deleteOmicsRun
+def test_delete_omics_run_unauthorized(client, user2, group2, run1):
+    response = delete_omics_run(client, run1.runUri, user2, group2)
+    assert_that(response.errors[0].message).contains('UnauthorizedOperation', 'DELETE_OMICS_RUN', run1.runUri)
 
 
 def test_delete_omics_run(client, user, group, run1):
-    query = """
-        mutation deleteOmicsRun($input: OmicsDeleteInput!) {
-          deleteOmicsRun(input: $input)
-        }
-        """
-
-    response = client.query(
-        query,
-        input={
-            'runUris': [run1.runUri],
-            'deleteFromAWS': True,
-        },
-        username=user.username,
-        groups=[group.name],
-    )
-    print(response)
-    print(response.data)
-    assert response.data.deleteOmicsRun
-    query = """
-        query listOmicsRuns($filter: OmicsFilter) {
-          listOmicsRuns(filter: $filter) {
-            count
-            page
-            pages
-            hasNext
-            hasPrevious
-            nodes {
-              runUri
-              workflowUri
-              name
-              owner
-              SamlAdminGroupName
-              outputDatasetUri
-              description
-              label
-              created
-              tags
-              environment {
-                label
-                name
-                environmentUri
-                AwsAccountId
-                region
-                SamlGroupName
-              }
-              organization {
-                label
-                name
-                organizationUri
-              }
-              workflow {
-                label
-                name
-                workflowUri
-                id
-                description
-                parameterTemplate
-                type
-              }
-              status {
-                status
-                statusMessage
-              }
-            }
-          }
-        }
-        """
-
-    response = client.query(
-        query,
-        filter=None,
-        username=user.username,
-        groups=[group.name],
-    )
-
-    assert response.data.listOmicsRuns['count'] == 0
-    assert len(response.data.listOmicsRuns['nodes']) == 0
+    response = delete_omics_run(client, run1.runUri, user, group)
+    assert_that(response.data.deleteOmicsRun).is_true()
+    response = list_omics_runs(client, user, group)
+    assert_that(response.data.listOmicsRuns['count']).is_equal_to(0)