diff --git a/test_suite/unit_tests/AI/test_traffic.cxx b/test_suite/unit_tests/AI/test_traffic.cxx
index 0fb3a68be..7e447dbe0 100644
--- a/test_suite/unit_tests/AI/test_traffic.cxx
+++ b/test_suite/unit_tests/AI/test_traffic.cxx
@@ -605,5 +605,5 @@ void TrafficTests::dump(FGAIAircraft* aiAircraft) {
     std::cout << "********************\n";
     std::cout << "Geod " << aiAircraft->getGeodPos() << "\t Speed : " << aiAircraft->getSpeed() << "\n";
     std::cout << "WP   " << aiAircraft->GetFlightPlan()->getCurrentWaypoint()->getName() << "\t" << aiAircraft->GetFlightPlan()->getCurrentWaypoint()->getPos() << "\r\n";
-    std::cout << "Heading " << aiAircraft->getTrueHeadingDeg() << "\t VSpeed : " << aiAircraft->getVerticalSpeed() << "\n";
+    std::cout << "Heading " << aiAircraft->getTrueHeadingDeg() << "\t VSpeed : " << aiAircraft->getVerticalSpeedFPM() << "\n";
 }
diff --git a/test_suite/unit_tests/Airports/CMakeLists.txt b/test_suite/unit_tests/Airports/CMakeLists.txt
new file mode 100644
index 000000000..bd55a8216
--- /dev/null
+++ b/test_suite/unit_tests/Airports/CMakeLists.txt
@@ -0,0 +1,13 @@
+
+set(TESTSUITE_SOURCES
+    ${TESTSUITE_SOURCES}
+    ${CMAKE_CURRENT_SOURCE_DIR}/TestSuite.cxx
+    ${CMAKE_CURRENT_SOURCE_DIR}/test_runway.cxx
+    PARENT_SCOPE
+)
+
+set(TESTSUITE_HEADERS
+    ${TESTSUITE_HEADERS}
+    ${CMAKE_CURRENT_SOURCE_DIR}/test_runway.hxx
+    PARENT_SCOPE
+)
diff --git a/test_suite/unit_tests/Airports/TestSuite.cxx b/test_suite/unit_tests/Airports/TestSuite.cxx
new file mode 100644
index 000000000..0c70af3db
--- /dev/null
+++ b/test_suite/unit_tests/Airports/TestSuite.cxx
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2020 James Turner
+ *
+ * This file is part of the program FlightGear.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "test_runway.hxx"
+
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(RunwayTests, "Unit tests");
diff --git a/test_suite/unit_tests/Airports/test_runway.cxx b/test_suite/unit_tests/Airports/test_runway.cxx
new file mode 100644
index 000000000..9923dcc8e
--- /dev/null
+++ b/test_suite/unit_tests/Airports/test_runway.cxx
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2021 Keith Paterson
+ *
+ * This file is part of the program FlightGear.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include "test_runway.hxx"
+
+#include <iostream>
+#include <cstring>
+#include <memory>
+#include <unistd.h>
+
+#include <simgear/math/sg_geodesy.hxx>
+#include <simgear/math/SGGeod.hxx>
+#include <AIModel/AIAircraft.hxx>
+#include <AIModel/AIFlightPlan.hxx>
+#include <AIModel/AIManager.hxx>
+#include <AIModel/performancedb.hxx>
+#include <Airports/airport.hxx>
+#include <Airports/airportdynamicsmanager.hxx>
+#include <Airports/runways.hxx>
+#include <Traffic/TrafficMgr.hxx>
+#include <Time/TimeManager.hxx>
+
+#include <ATC/atc_mgr.hxx>
+
+#include <Main/fg_props.hxx>
+#include <Main/globals.hxx>
+
+/////////////////////////////////////////////////////////////////////////////
+
+// Set up function for each test.
+void RunwayTests::setUp()
+{
+}
+
+// Clean up after each test.
+void RunwayTests::tearDown()
+{
+}
+
+void RunwayTests::testRunway()
+{
+    PositionedID aAirport = 0;
+    SGGeod aGeod = SGGeod::fromDeg(-33.92935800, 151.17160300);
+    double heading = 155;
+    int length = 3962;
+    double width = 45.0;
+    double displ_thresh = 79;
+    double stopway = 0;
+    FGRunway runway = FGRunway( FGPositioned::RUNWAY,
+           aAirport, 
+           "16R",
+            aGeod,
+            heading, 
+            length,
+            width,
+            displ_thresh,
+            stopway,
+            1);
+    int calculated = SGGeodesy::distanceM(runway.begin(), runway.end());
+    CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Distance between the runway endpoints should be runway length", length, calculated, 1);
+    calculated = SGGeodesy::distanceM(runway.begin(), runway.pointOnCenterline(-length));
+    CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Distance between the runway start and point on centerline should be runway length", length, calculated, 1);
+}
diff --git a/test_suite/unit_tests/Airports/test_runway.hxx b/test_suite/unit_tests/Airports/test_runway.hxx
new file mode 100644
index 000000000..465fa6987
--- /dev/null
+++ b/test_suite/unit_tests/Airports/test_runway.hxx
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2021 Keith Paterson
+ *
+ * This file is part of the program FlightGear.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+#include <memory>
+
+#include <simgear/props/props.hxx>
+
+class SGGeod;
+
+class FGAIAircraft;
+
+// The flight plan unit tests.
+class RunwayTests : public CppUnit::TestFixture
+{
+    // Set up the test suite.
+    CPPUNIT_TEST_SUITE(RunwayTests);
+    CPPUNIT_TEST(testRunway);
+    CPPUNIT_TEST_SUITE_END();
+
+
+public:
+    // Set up function for each test.
+    void setUp();
+
+    // Clean up after each test.
+    void tearDown();
+
+    // The tests.
+    void testRunway();
+};
diff --git a/test_suite/unit_tests/CMakeLists.txt b/test_suite/unit_tests/CMakeLists.txt
index 411e61ebd..23ba7d576 100644
--- a/test_suite/unit_tests/CMakeLists.txt
+++ b/test_suite/unit_tests/CMakeLists.txt
@@ -9,6 +9,7 @@ foreach( unit_test_category
         Instrumentation
         Scripting
         AI
+        Airports
         Autopilot
     )