diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 530caf2f1..f8ff07caf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,16 +8,20 @@ stages:
 build:
   stage: build
   script:
+    - rm -rf .git/modules/* ./docs ./libraries/fc
     - git submodule sync
     - git submodule update --init --recursive
-    - cmake .
+    - rm -rf build
+    - mkdir build
+    - cd build
+    - cmake ..
     - make -j$(nproc)
   artifacts:
     untracked: true
     paths:
-      - libraries/
-      - programs/
-      - tests/
+      - build/libraries/
+      - build/programs/
+      - build/tests/
   tags:
     - builder
 
@@ -26,9 +30,9 @@ test:
   dependencies:
     - build
   script:
-    - ./tests/betting_test --log_level=message
-    - ./tests/chain_test --log_level=message
-    - ./tests/cli_test --log_level=message
+    - ./build/tests/betting_test --log_level=message
+    - ./build/tests/chain_test --log_level=message
+    - ./build/tests/cli_test --log_level=message
   tags:
     - builder
 
diff --git a/tests/cli/son.cpp b/tests/cli/son.cpp
index f640a1d7a..d8eabf7d9 100644
--- a/tests/cli/son.cpp
+++ b/tests/cli/son.cpp
@@ -205,8 +205,8 @@ BOOST_AUTO_TEST_CASE( son_voting )
       son_object son2_obj;
       signed_transaction vote_son1_tx;
       signed_transaction vote_son2_tx;
-      int son1_start_votes, son1_end_votes;
-      int son2_start_votes, son2_end_votes;
+      uint64_t son1_start_votes, son1_end_votes;
+      uint64_t son2_start_votes, son2_end_votes;
 
       son1_obj = con.wallet_api_ptr->get_son("son1account");
       son1_start_votes = son1_obj.total_votes;
@@ -436,8 +436,8 @@ BOOST_AUTO_TEST_CASE( update_son_votes_test )
 
        son_object son1_obj;
        son_object son2_obj;
-       int son1_start_votes, son1_end_votes;
-       int son2_start_votes, son2_end_votes;
+       uint64_t son1_start_votes, son1_end_votes;
+       uint64_t son2_start_votes, son2_end_votes;
 
        // Get votes at start
        son1_obj = con.wallet_api_ptr->get_son("son1account");
@@ -488,7 +488,7 @@ BOOST_AUTO_TEST_CASE( update_son_votes_test )
        son2_obj = con.wallet_api_ptr->get_son("son2account");
        // voice distribution changed, SON2 now has all voices
        son2_end_votes = son2_obj.total_votes;
-       BOOST_CHECK(son2_end_votes > son2_start_votes);
+       BOOST_CHECK((son2_end_votes > 0) && (son2_end_votes <= son2_start_votes)); // nathan spent funds for vb, it has different voting power
        son2_start_votes = son2_end_votes;
 
        // Try to reject incorrect SON