diff --git a/external/catch b/external/catch
index 7c9f92bc1..d10b9bd02 160000
--- a/external/catch
+++ b/external/catch
@@ -1 +1 @@
-Subproject commit 7c9f92bc1c6e82ad5b6af8dff9f97af880fae9c6
+Subproject commit d10b9bd02e098476670f5eb0527d2c7281476e8a
diff --git a/src/object_store.cpp b/src/object_store.cpp
index a5f9344d1..d02cfe9b6 100644
--- a/src/object_store.cpp
+++ b/src/object_store.cpp
@@ -765,7 +765,7 @@ Schema ObjectStore::schema_from_group(Group const& group) {
     return schema;
 }
 
-util::Optional<Property> ObjectStore::property_for_column_index(ConstTableRef& table, ColKey column_key)
+util::Optional<Property> ObjectStore::property_for_column_key(ConstTableRef& table, ColKey column_key)
 {
     StringData column_name = table->get_column_name(column_key);
 
diff --git a/src/object_store.hpp b/src/object_store.hpp
index b989b5fc8..42e6890af 100644
--- a/src/object_store.hpp
+++ b/src/object_store.hpp
@@ -102,7 +102,7 @@ class ObjectStore {
 
     // get the property for a existing column in the given table. return none if the column is reserved internally.
     // NOTE: is_primary won't be set for the returned property.
-    static util::Optional<Property> property_for_column_index(ConstTableRef& table, ColKey column_key);
+    static util::Optional<Property> property_for_column_key(ConstTableRef& table, ColKey column_key);
 
     static void set_schema_keys(Group const& group, Schema& schema);
 
diff --git a/tests/benchmarks/main.cpp b/tests/benchmarks/main.cpp
index 60ee04e0a..4083850f0 100644
--- a/tests/benchmarks/main.cpp
+++ b/tests/benchmarks/main.cpp
@@ -18,9 +18,6 @@
 
 #define CATCH_CONFIG_ENABLE_BENCHMARKING
 
-// FIXME: the nextafter define below can be removed once we upgrade to an
-// Android ndk version which has support for std::nextafter (absent in ndk r10e)
-#define CATCH_CONFIG_GLOBAL_NEXTAFTER
 #define CATCH_CONFIG_RUNNER
 #include "catch2/catch.hpp"
 
diff --git a/tests/main.cpp b/tests/main.cpp
index 5c86c3ef4..1e3083473 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -16,9 +16,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////
 
-// FIXME: the nextafter define below can be removed once we upgrade to an
-// Android ndk version which has support for std::nextafter (absent in ndk r10e)
-#define CATCH_CONFIG_GLOBAL_NEXTAFTER
 #define CATCH_CONFIG_RUNNER
 #include "catch2/catch.hpp"
 
diff --git a/tests/object_store.cpp b/tests/object_store.cpp
index 8a0fed935..2ac4deffb 100644
--- a/tests/object_store.cpp
+++ b/tests/object_store.cpp
@@ -38,7 +38,7 @@ TEST_CASE("ObjectStore: table_name_for_object_type()") {
     }
 }
 
-TEST_CASE("ObjectStore:: property_for_column_index()") {
+TEST_CASE("ObjectStore:: property_for_column_key()") {
     SECTION("Property should match the schema") {
         Schema schema = {
             {"object", {
@@ -65,7 +65,7 @@ TEST_CASE("ObjectStore:: property_for_column_index()") {
 
         auto all_columns = table->get_column_keys();
         for (auto col : all_columns) {
-            auto property = ObjectStore::property_for_column_index(table, col);
+            auto property = ObjectStore::property_for_column_key(table, col);
             if (!property) {
                 FAIL();
                 continue;