diff --git a/ogn/model/aircraft_beacon.py b/ogn/model/aircraft_beacon.py
index dc80880..bd15564 100644
--- a/ogn/model/aircraft_beacon.py
+++ b/ogn/model/aircraft_beacon.py
@@ -34,7 +34,7 @@ class AircraftBeacon(Beacon):
     device = relationship('Device', foreign_keys=[device_id])
 
     def __repr__(self):
-        return "<AircraftBeacon %s: %s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s>" % (
+        return "<AircraftBeacon %s: %s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s>" % (
             self.address_type,
             self.aircraft_type,
             self.stealth,
diff --git a/ogn/model/airport.py b/ogn/model/airport.py
index b7ed8da..c3ac736 100644
--- a/ogn/model/airport.py
+++ b/ogn/model/airport.py
@@ -32,8 +32,8 @@ class Airport(Base):
             self.country_code,
             self.style,
             self.description,
-            self.latitude,
-            self.longitude,
+            self.location_wkt.latitude if self.location_wkt else None,
+            self.location_wkt.longitude if self.location_wkt else None,
             self.altitude,
             self.runway_direction,
             self.runway_length,
diff --git a/ogn/model/receiver_beacon.py b/ogn/model/receiver_beacon.py
index e008467..8fd1f89 100644
--- a/ogn/model/receiver_beacon.py
+++ b/ogn/model/receiver_beacon.py
@@ -36,7 +36,7 @@ class ReceiverBeacon(Beacon):
     receiver = relationship('Receiver', foreign_keys=[receiver_id])
 
     def __repr__(self):
-        return "<ReceiverBeacon %s: %s>" % (
+        return "<ReceiverBeacon %s: %s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s>" % (
             self.version,
             self.platform,
             self.cpu_load,
diff --git a/tests/model/__init__.py b/tests/model/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/model/all_classes.py b/tests/model/all_classes.py
new file mode 100644
index 0000000..b53d613
--- /dev/null
+++ b/tests/model/all_classes.py
@@ -0,0 +1,14 @@
+import unittest
+
+from ogn.model import AircraftBeacon, Airport, ReceiverBeacon
+
+
+class TestStringMethods(unittest.TestCase):
+    def test_string(self):
+        print(AircraftBeacon())
+        print(Airport())
+        print(ReceiverBeacon())
+
+
+if __name__ == '__main__':
+    unittest.main()