diff --git a/.buildkite/steps/deploy-test.sh b/.buildkite/steps/deploy-test.sh
index af49b712..9fb5e735 100755
--- a/.buildkite/steps/deploy-test.sh
+++ b/.buildkite/steps/deploy-test.sh
@@ -15,7 +15,7 @@ docker-compose up -d
 
 # Run unit-tests
 sleep 10s
-docker run --network golos-tests_contracts-net -ti cyberway/golos.contracts:$IMAGETAG  /bin/bash -c 'export MONGO_URL=mongodb://mongo:27017; /opt/golos.contracts/unit_test && /opt/cyberway.contracts/unit_test -t "!cyber_system_tests/*"'
+docker run --network golos-tests_contracts-net -ti cyberway/golos.contracts:$IMAGETAG  /bin/bash -c 'export MONGO_URL=mongodb://mongo:27017; /opt/golos.contracts/unit_test -l message -r detailed && /opt/cyberway.contracts/unit_test -t "!cyber_system_tests/*"'
 result=$?
 
 docker-compose down
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 859ba2dd..d1f4824d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.5)
 project(golos_dapp_contracts VERSION 0.1.0)
 
 set(EOSIO_CDT_VERSION_MIN "1.4")
-set(EOSIO_CDT_VERSION_SOFT_MAX "1.4")
+set(EOSIO_CDT_VERSION_SOFT_MAX "1.5")
 #set(EOSIO_CDT_VERSION_HARD_MAX "")
 
 find_package(eosio.cdt)
diff --git a/UnitTestsExternalProject.txt b/UnitTestsExternalProject.txt
index 15be115b..5ece88be 100644
--- a/UnitTestsExternalProject.txt
+++ b/UnitTestsExternalProject.txt
@@ -3,7 +3,11 @@ find_package(Git REQUIRED)
 include(GNUInstallDirs)
 
 if(EOSIO_ROOT STREQUAL "" OR NOT EOSIO_ROOT)
-  set(EOSIO_ROOT "/opt/eosio")
+  if(APPLE)
+    set(EOSIO_ROOT "/usr/local/eosio")
+  else()
+    set(EOSIO_ROOT "/opt/eosio")
+  endif()
 endif()
 
 string(REPLACE ";" "|" TEST_FRAMEWORK_PATH "${CMAKE_FRAMEWORK_PATH}")
diff --git a/cyberway.contracts b/cyberway.contracts
index 5deb4a51..95eac3da 160000
--- a/cyberway.contracts
+++ b/cyberway.contracts
@@ -1 +1 @@
-Subproject commit 5deb4a5137a4b657f55b773626d671ea29055bcf
+Subproject commit 95eac3da5f93e5d6642920201b53f43acbd34448
diff --git a/tests/golos_tester.cpp b/tests/golos_tester.cpp
index 55998c55..f2f45f21 100644
--- a/tests/golos_tester.cpp
+++ b/tests/golos_tester.cpp
@@ -187,6 +187,9 @@ vector<variant> golos_tester::get_all_chaindb_rows(name code, uint64_t scope, na
         auto v = _chaindb.value_at_cursor(cursor);
         all.push_back(v);
     }
+    if (!all.size()) {
+        BOOST_TEST_REQUIRE(!strict);
+    }
     return all;
 }
 
diff --git a/tests/golos_tester.hpp b/tests/golos_tester.hpp
index 46ca2d7d..6458cf89 100644
--- a/tests/golos_tester.hpp
+++ b/tests/golos_tester.hpp
@@ -50,10 +50,8 @@ class golos_tester : public tester {
 
 public:
     golos_tester(name code): tester(), _code(code), _chaindb(control->chaindb()) {
-        std::cout << "golos_tester()" << std::endl;
     }
     ~golos_tester() {
-        std::cout << "~golos_tester()" << std::endl;
     }
 
     void install_contract(account_name acc, const std::vector<uint8_t>& wasm, const std::vector<char>& abi, bool produce = true);