diff --git a/include/albatross/src/indexing/async_apply.hpp b/include/albatross/src/indexing/async_apply.hpp
index 740e6dfd..f3df10b9 100644
--- a/include/albatross/src/indexing/async_apply.hpp
+++ b/include/albatross/src/indexing/async_apply.hpp
@@ -34,7 +34,7 @@ template <typename ValueType, typename ApplyFunction,
                                   int>::type = 0>
 inline void async_apply(const std::vector<ValueType> &xs, ApplyFunction &&f) {
   std::vector<std::future<void>> futures;
-  for (const auto &x : xs) {
+  for (const ValueType &x : xs) {
     futures.emplace_back(async_safe(f, x));
   }
   for (auto &f : futures) {
@@ -51,7 +51,7 @@ template <typename ValueType, typename ApplyFunction,
                                   int>::type = 0>
 inline auto async_apply(const std::vector<ValueType> &xs, ApplyFunction &&f) {
   std::vector<std::future<ApplyType>> futures;
-  for (const auto &x : xs) {
+  for (const ValueType &x : xs) {
     futures.emplace_back(async_safe(f, x));
   }
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 53e9fade..5247cc8a 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_executable(albatross_unit_tests 
   test_apply.cc
-  test_async_utils.cc
+  test_async_apply.cc
   test_block_utils.cc
   test_call_trace.cc
   test_callers.cc
diff --git a/tests/test_async_utils.cc b/tests/test_async_apply.cc
similarity index 98%
rename from tests/test_async_utils.cc
rename to tests/test_async_apply.cc
index 0ea2843a..a8f9adf3 100644
--- a/tests/test_async_utils.cc
+++ b/tests/test_async_apply.cc
@@ -13,7 +13,6 @@
 #include <gtest/gtest.h>
 
 #include <albatross/Indexing>
-#include <albatross/utils/AsyncUtils>
 #include <albatross/utils/RandomUtils>
 
 #include <chrono>