Update test includes for diff catch version

tests/Cell.cpp

@@ -1,4 +1,4 @@
-#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch.hpp>
 #include "Cell.h"
 #include "Distances.h"
 

tests/Distances.cpp

@@ -1,4 +1,4 @@
-#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch.hpp>
 #include "Distances.h"
 #include "Grid.h"
 
@@ -38,4 +38,4 @@ TEST_CASE("Distances class tests", "[distances]") {
         distances.setDistance(grid.getCellRef(2, 2), 2);
         REQUIRE(distances.contains(grid.getCellRef(2, 2)));
     }
-}
+}

tests/Grid.cpp

@@ -1,4 +1,4 @@
-#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch.hpp>
 #include "Grid.h"
 
 TEST_CASE("Grid class tests", "[grid]") {
@@ -90,4 +90,4 @@ TEST_CASE("MaskedGrid", "[grid]") {
     REQUIRE(mask.size() == 3);
     REQUIRE(grid.size() == 3);
   }
-}
+}

tests/Mask.cpp

@@ -1,4 +1,4 @@
-#include <catch2/catch_all.hpp>
+#include <catch2/catch.hpp>
 
 #include "Mask.h"
 #include "Grid.h"
@@ -100,4 +100,4 @@ TEST_CASE("Mask from file with mismatched line lengths", "[Mask]") {
 TEST_CASE("Mask from more complex mask file", "[Mask]") {
   Mask mask = Mask::fromFile("data/mask.txt");
   REQUIRE(mask.size() == 76);
-}
+}

tests/main_test.cpp

@@ -1,4 +1,6 @@
-#include <catch2/catch_all.hpp>
+#define CATCH_CONFIG_MAIN
+#define CATCH_CONFIG_ENABLE_BENCHMARKING
+#include <catch2/catch.hpp>
 
 #include "AldousBroder.h"
 #include "BinaryTree.h"