diff --git a/base/management/commands/setup.py b/base/management/commands/setup.py
index ef405996..9db47b54 100644
--- a/base/management/commands/setup.py
+++ b/base/management/commands/setup.py
@@ -79,7 +79,7 @@ def create_district(self, district_item, association):
             self.stdout.write('EXISTING District: {}'.format(district))
         self.processed_districts.add(bhv_id)
 
-        seasons_url = source_url.district_source_url(district.bhv_id, '2000-01-01')
+        seasons_url = source_url.district_source_url(district.bhv_id, '1990-01-01')
         seasons_dom = logic.get_html(seasons_url)
         season_headings = seasons_dom.xpath('//div[@id="results"]/div/a[@name]/h4/text()')
         season_links = seasons_dom.xpath('//div[@id="results"]/div/a[@href]')
@@ -93,6 +93,10 @@ def create_season(self, district_season_heading, district_season_link, district)
             self.stdout.write('SKIPPING District Season (irrelevant): {} {}'.format(district, district_season_heading))
             return
 
+        if start_year < 2000:
+            with open('out.log', 'a') as file:
+                file.write('{} {}'.format(district, district_season_heading))
+
         if self.options['seasons'] and start_year not in self.options['seasons']:
             self.stdout.write('SKIPPING District Season (options): {}'.format(start_year))
             return
diff --git a/base/tests/test_setup_league.py b/base/tests/test_setup_league.py
new file mode 100644
index 00000000..889d72f6
--- /dev/null
+++ b/base/tests/test_setup_league.py
@@ -0,0 +1,65 @@
+from django.core.management import call_command
+from django.test import TestCase
+
+from base import models
+
+
+class SetupTest(TestCase):
+
+    def assert_single_object(self, model):
+        objects = model.objects.all()
+        self.assertTrue(objects.exists())
+        self.assertEqual(len(objects), 1)
+        return objects[0]
+
+    def test__setup__mvl_2016(self):
+        return_code = call_command('setup', '-a 35', '-d 35', '-s 2016', '-l 21666')
+        self.assertEqual(return_code, None)
+
+        season = self.assert_single_object(models.Season)
+        self.assertEqual(season.start_year, 2016)
+
+        league = self.assert_single_object(models.League)
+        self.assertEqual(league.name, "Verbandsliga Männer")
+        self.assertEqual(league.abbreviation, "M-VL")
+        self.assertEqual(league.bhv_id, 21666)
+        self.assertEqual(league.season, season)
+
+    def test__setup__mvl_2017(self):
+        return_code = call_command('setup', '-a 35', '-d 35', '-s 2017', '-l 26777')
+        self.assertEqual(return_code, None)
+
+        season = self.assert_single_object(models.Season)
+        self.assertEqual(season.start_year, 2017)
+
+        league = self.assert_single_object(models.League)
+        self.assertEqual(league.name, "Verbandsliga Männer")
+        self.assertEqual(league.abbreviation, "M-VL")
+        self.assertEqual(league.bhv_id, 26777)
+        self.assertEqual(league.season, season)
+
+    def test__setup__mwls_2016(self):
+        return_code = call_command('setup', '-a 3', '-d 3', '-s 2016', '-l 21747')
+        self.assertEqual(return_code, None)
+
+        season = self.assert_single_object(models.Season)
+        self.assertEqual(season.start_year, 2016)
+
+        league = self.assert_single_object(models.League)
+        self.assertEqual(league.name, "Männer Württemberg-Liga Süd")
+        self.assertEqual(league.abbreviation, "M-WL-S")
+        self.assertEqual(league.bhv_id, 21747)
+        self.assertEqual(league.season, season)
+
+    def test__setup__mwls_2017(self):
+        return_code = call_command('setup', '-a 3', '-d 3', '-s 2017', '-l 27505')
+        self.assertEqual(return_code, None)
+
+        season = self.assert_single_object(models.Season)
+        self.assertEqual(season.start_year, 2017)
+
+        league = self.assert_single_object(models.League)
+        self.assertEqual(league.name, "Männer Württemberg-Liga Süd")
+        self.assertEqual(league.abbreviation, "M-WL-S")
+        self.assertEqual(league.bhv_id, 27505)
+        self.assertEqual(league.season, season)