diff --git a/.circleci/config.yml b/.circleci/config.yml
index 23b83fc..5ea0773 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,7 +5,7 @@ orbs:
 jobs:
   build:
     docker:
-      - image: 218546966473.dkr.ecr.us-east-1.amazonaws.com/circle-ci:stitch-tap-tester
+      - image: 218546966473.dkr.ecr.us-east-1.amazonaws.com/circle-ci:stitch-tap-tester-18.04
       - image: singerio/postgres:9.6-wal2json-2.2-ssl
         environment:
           POSTGRES_USER: postgres
@@ -49,7 +49,7 @@ workflows:
       - build:
           context:
             - circleci-user
-            - tier-1-tap-user
+            - tap-tester-user
   build_daily:
     <<: *commit_jobs
     triggers:
diff --git a/tests/test_postgres_discovery.py b/tests/test_postgres_discovery.py
index 2fb4a56..15ce7c8 100644
--- a/tests/test_postgres_discovery.py
+++ b/tests/test_postgres_discovery.py
@@ -404,7 +404,7 @@ def discovery_test(self, conn_id):
                 )
                 actual_fields_to_datatypes = {
                     item['breadcrumb'][1]: item['metadata'].get('sql-datatype')
-                    for item in stream_metadata[1:]
+                    for item in stream_metadata if item['breadcrumb'] != []
                 }
 
                 # Verify there is only 1 top level breadcrumb in metadata