diff --git a/strategies/test_strategies.py b/strategies/test_strategies.py
index 85fd8ad..9157da3 100644
--- a/strategies/test_strategies.py
+++ b/strategies/test_strategies.py
@@ -82,14 +82,14 @@ def test_reimbursement_calculation(self):
     def test_rate_determination(self):
         # State, SFA, 60%, Severe Need 
         r = CEPRate("ak",True,"more",True)
-        self.assertEqual(r.paid_lunch_rate,0.59)
-        self.assertEqual(r.free_breakfast_rate,3.78)
+        self.assertEqual(r.paid_lunch_rate,1.03)
+        self.assertEqual(r.free_breakfast_rate,4.21)
         r = CEPRate("ny",True,"less",False)
-        self.assertEqual(r.free_breakfast_rate,1.97)
-        self.assertEqual(r.paid_lunch_rate,0.35)
+        self.assertEqual(r.free_breakfast_rate,2.26)
+        self.assertEqual(r.paid_lunch_rate,0.77)
         r = CEPRate("tx",True,"max",True)
-        self.assertEqual(r.paid_breakfast_rate,0.33)
-        self.assertEqual(r.free_lunch_rate,3.68)
+        self.assertEqual(r.paid_breakfast_rate,0.50)
+        self.assertEqual(r.free_lunch_rate,4.50)
     
     def test_group(self):
         district = self.create_default_districts()
diff --git a/test_server.py b/test_server.py
index c593782..3c7c518 100644
--- a/test_server.py
+++ b/test_server.py
@@ -121,7 +121,32 @@ def test_school_with_no_enrolled(self):
         from lambda_function import test_run
         import datetime
         result = test_run(for_lambda,datetime.datetime.now())
- 
+
+    def test_max_groups_and_evalby_none(self):
+        # https://sentry.io/organizations/mealscount-dev/issues/3555682831/
+        for_lambda = {
+           "code": 'District Name', 
+            "name": 'District Name', 
+            "schools": [{
+                "daily_breakfast_served": 500, 
+                "daily_lunch_served": 800, 
+                "school_code": 'XYZ', 
+                "school_name": 'XYZ', 
+                "severe_need": False, 
+                "total_eligible": 1000, 
+                "total_enrolled": 0 # Seen this.
+            } for i in range(2)],
+            "state_code": 'MI', 
+            "strategies_to_run": [
+                'Pairs', 
+            ],
+            "max_groups":None,
+            #"evaluate_by":None,
+        }
+        from lambda_function import test_run
+        import datetime
+        result = test_run(for_lambda,datetime.datetime.now())
+  
 # Mostly accurate, severe need is not accurate
 def oceanside():
     return copy.deepcopy({