2 files changed, 21 insertions, 20 deletions
diff --git a/test/buildtool/execution_engine/executor/executor.test.cpp b/test/buildtool/execution_engine/executor/executor.test.cpp
index 63f41521..beec0842 100755
--- a/test/buildtool/execution_engine/executor/executor.test.cpp
+++ b/test/buildtool/execution_engine/executor/executor.test.cpp
@@ -130,16 +130,13 @@ class TestApi : public IExecutionApi {
     }
     auto Upload(BlobContainer const& blobs, bool /*unused*/) noexcept
         -> bool final {
-        for (auto const& blob : blobs) {
-            if (config_.artifacts[blob.data].uploads) {
-                continue;  // for local artifacts
-            }
-            if (config_.artifacts[blob.digest.hash()].uploads) {
-                continue;  // for known and action artifacts
-            }
-            return false;
-        }
-        return true;
+        return std::all_of(
+            blobs.begin(), blobs.end(), [this](auto const& blob) {
+                return config_.artifacts[blob.data]
+                           .uploads  // for local artifacts
+                       or config_.artifacts[blob.digest.hash()]
+                              .uploads;  // for known and action artifacts
+            });
     }
     auto UploadTree(
         std::vector<
diff --git a/test/buildtool/execution_engine/traverser/traverser.test.cpp b/test/buildtool/execution_engine/traverser/traverser.test.cpp
index 63d1fad6..693097d5 100644
--- a/test/buildtool/execution_engine/traverser/traverser.test.cpp
+++ b/test/buildtool/execution_engine/traverser/traverser.test.cpp
@@ -95,16 +95,20 @@ class TestExecutor {
             build_info_->SetName(name_);
             bool const all_deps_available = AllAvailable(action->Children());
             if (all_deps_available) {
-                for (auto const& [name, node] : action->OutputFiles()) {
-                    if (not build_info_->InsertCorrectlyBuilt(
-                            node->Content().Id())) {
-                        [[maybe_unused]] auto was_it_added =
-                            build_info_->InsertIncorrectlyBuilt(
-                                node->Content().Id());
-                        return false;
-                    }
-                }
-                return true;
+                return std::all_of(
+                    action->OutputFiles().begin(),
+                    action->OutputFiles().end(),
+                    [this](auto const& entry) {
+                        auto const& [name, node] = entry;
+                        if (not build_info_->InsertCorrectlyBuilt(
+                                node->Content().Id())) {
+                            [[maybe_unused]] auto was_it_added =
+                                build_info_->InsertIncorrectlyBuilt(
+                                    node->Content().Id());
+                            return false;
+                        }
+                        return true;
+                    });
             }
             for (auto const& [name, node] : action->OutputFiles()) {
                 [[maybe_unused]] auto was_it_added =