diff --git a/events/tests.py b/events/tests.py
index 7294e95..4128e1f 100644
--- a/events/tests.py
+++ b/events/tests.py
@@ -13,8 +13,8 @@ class TestEventModel(TestCase):
         Return the desired event
         """
         event = Event.objects.get(id=1)
-        self.assertEqual("Chicago Firefighters", event.away_event.name)
-        self.assertEqual("Dallas Steaks", event.home_event.name)
+        self.assertEqual("Chicago Firefighters", event.away_team.name)
+        self.assertEqual("Dallas Steaks", event.home_team.name)
         self.assertEqual('George Fourman Stadium', event.venue.name)
         self.assertEqual(datetime(
             year=2020,
diff --git a/teams/tests.py b/teams/tests.py
index 0e52a25..dd0a73b 100644
--- a/teams/tests.py
+++ b/teams/tests.py
@@ -11,7 +11,7 @@ class TestTeamModel(TestCase):
         Return the desired team
         """
         team = Team.objects.get(id=1)
-        self.assertEqual(team.name, "Chesapeake Racetrack and Ballpark")
+        self.assertEqual(team.name, "Chicago Firefighters")
 
 class TestTeamViews(TestCase):
     fixtures = ['blaseball']
@@ -19,9 +19,9 @@ class TestTeamViews(TestCase):
     def test_team_list(self):
         response = self.client.get(reverse('teams list'))
         self.assertEqual(response.status_code, 200)
-        self.assertIn((1, 'Chesapeake Racetrack and Ballpark'), response.context['items'])
-        self.assertIn((2, 'Tokyo Fitness Center'), response.context['items'])
-        self.assertIn((25, 'ILB Historical Preservation Site'), response.context['items'])
+        self.assertIn({'id':1, 'title':'Chicago Firefighters'}, response.context['items'])
+        self.assertIn({'id':2, 'title':'Boston Flowers'}, response.context['items'])
+        self.assertIn({'id':24, 'title':'Baltimore Crabs'}, response.context['items'])
 
     def test_team_edit(self):
         response = self.client.get(reverse('edit team', args=[1]))
diff --git a/venues/tests.py b/venues/tests.py
index 151c3c9..7c11b04 100644
--- a/venues/tests.py
+++ b/venues/tests.py
@@ -18,9 +18,9 @@ class TestVenueViews(TestCase):
     def test_venue_list(self):
         response = self.client.get(reverse('venues list'))
         self.assertEqual(response.status_code, 200)
-        self.assertIn((1, 'Chesapeake Racetrack and Ballpark'), response.context['items'])
-        self.assertIn((2, 'Tokyo Fitness Center'), response.context['items'])
-        self.assertIn((25, 'ILB Historical Preservation Site'), response.context['items'])
+        self.assertIn({'id':1, 'title':'Chesapeake Racetrack and Ballpark'}, response.context['items'])
+        self.assertIn({'id':2, 'title':'Tokyo Fitness Center'}, response.context['items'])
+        self.assertIn({'id':25, 'title':'ILB Historical Preservation Site'}, response.context['items'])
 
     def test_venue_edit(self):
         response = self.client.get(reverse('edit venue', args=[1]))