diff --git a/.circleci/config.yml b/.circleci/config.yml
index f0611b1..7546605 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -93,6 +93,7 @@ jobs:
   test:
     <<: *defaults
     steps:
+      - checkout_utils
       - checkout_code
       - run: ./scripts/checks.sh
       - run: ../utils/common_bash/defaults/code_cov.sh
diff --git a/src/main/java/io/lumigo/core/SpansContainer.java b/src/main/java/io/lumigo/core/SpansContainer.java
index a618935..c8c692e 100644
--- a/src/main/java/io/lumigo/core/SpansContainer.java
+++ b/src/main/java/io/lumigo/core/SpansContainer.java
@@ -203,8 +203,8 @@ public Span getStartFunctionSpan() {
 
     public List<Object> getAllCollectedSpans() {
         List<Object> spans = new LinkedList<>();
-        spans.addAll(httpSpans);
         spans.add(endFunctionSpan);
+        spans.addAll(httpSpans);
         return spans;
     }