diff --git a/api/src/main/java/ca/bc/gov/educ/api/ruleengine/dto/RuleProcessorData.java b/api/src/main/java/ca/bc/gov/educ/api/ruleengine/dto/RuleProcessorData.java
index 3854be94..54b664c1 100644
--- a/api/src/main/java/ca/bc/gov/educ/api/ruleengine/dto/RuleProcessorData.java
+++ b/api/src/main/java/ca/bc/gov/educ/api/ruleengine/dto/RuleProcessorData.java
@@ -23,7 +23,6 @@ public class RuleProcessorData implements RuleData {
     private List<ProgramAlgorithmRule> algorithmRules;
     private List<ProgramRequirement> gradProgramRules;
     private Map<String,OptionalProgramRuleProcessor> mapOptional;
-    private Map<String,Integer> map1996Crse;
     private List<StudentCourse> studentCourses;
     private List<StudentCourse> excludedCourses;
     private List<StudentAssessment> excludedAssessments;
diff --git a/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/AlgorithmSupportRule.java b/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/AlgorithmSupportRule.java
index a9ef2126..b0d3cfa1 100644
--- a/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/AlgorithmSupportRule.java
+++ b/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/AlgorithmSupportRule.java
@@ -146,9 +146,8 @@ public static int processExtraCredits(boolean extraCreditsUsed, int extraCredits
             }
         } else {
             if (totalCredits + sc.getCredits() <= requiredCredits) {
-                int credits = sc.isUsedInMinCreditRule() && (sc.getLeftOverCredits() != null && sc.getLeftOverCredits() > 0)? sc.getCredits() - sc.getLeftOverCredits() : sc.getCredits();
-                totalCredits += credits;
-                sc.setCreditsUsedForGrad(credits);
+                totalCredits += sc.getCredits();
+                sc.setCreditsUsedForGrad(sc.getCredits());
             } else {
                 int extraCredits = totalCredits + sc.getCredits() - requiredCredits;
                 totalCredits = requiredCredits;
diff --git a/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/MatchCredit1996Rule.java b/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/MatchCredit1996Rule.java
index ff2110dd..405cf2b2 100644
--- a/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/MatchCredit1996Rule.java
+++ b/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/MatchCredit1996Rule.java
@@ -39,7 +39,6 @@ public RuleData fire() {
 
         List<GradRequirement> requirementsMet = new ArrayList<>();
         List<GradRequirement> requirementsNotMet = new ArrayList<>();
-        Map<String,Integer> map1996 = new HashMap<>();
 
         List<StudentCourse> fineArtsCourseList = RuleProcessorRuleUtils
                 .getUniqueStudentCourses(ruleProcessorData.getStudentCourses(), ruleProcessorData.isProjected())
@@ -118,14 +117,13 @@ && isFineArtsOrAppliedSkillsRule(pr.getProgramRequirementCode().getProReqCode())
                         if (tempProgramRule != null
                                 && tempCourse.getCredits() > Integer.parseInt(tempProgramRule.getProgramRequirementCode().getRequiredCredits())) {
                             int extraCredits = tempCourse.getCredits() - Integer.parseInt(tempProgramRule.getProgramRequirementCode().getRequiredCredits());
-                            map1996.put(tempCourse.getCourseCode(), extraCredits);
                             tempCourse.setLeftOverCredits(extraCredits);
                         }
                     }
                 }
             }
             logger.debug("Temp Program Rule: {}", tempProgramRule);
-            processCourse(tempCourse, tempCourseRequirements, tempProgramRule, requirementsMet, gradProgramRulesMatch, map1996);
+            processCourse(tempCourse, tempCourseRequirements, tempProgramRule, requirementsMet, gradProgramRulesMatch);
 
             AlgorithmSupportRule.copyAndAddIntoStudentCoursesList(tempCourse, finalCourseList);
             AlgorithmSupportRule.copyAndAddIntoProgramRulesList(tempProgramRule, finalProgramRulesList);
@@ -166,14 +164,13 @@ && isFineArtsOrAppliedSkillsRule(pr.getProgramRequirementCode().getProReqCode())
 
                         if (tempProgramRule != null && tempCourse.getCredits() > Integer.parseInt(tempProgramRule.getProgramRequirementCode().getRequiredCredits())) {
                             int extraCredits = tempCourse.getCredits() - Integer.parseInt(tempProgramRule.getProgramRequirementCode().getRequiredCredits());
-                            map1996.put(tempCourse.getCourseCode(), extraCredits);
                             tempCourse.setLeftOverCredits(extraCredits);
                         }
                     }
                 }
             }
             logger.debug("Temp Program Rule: {}", tempProgramRule);
-            processCourse(tempCourse, tempCourseRequirements, tempProgramRule, requirementsMet, gradProgramRulesMatch, map1996);
+            processCourse(tempCourse, tempCourseRequirements, tempProgramRule, requirementsMet, gradProgramRulesMatch);
 
             AlgorithmSupportRule.copyAndAddIntoStudentCoursesList(tempCourse, finalCourseList);
             AlgorithmSupportRule.copyAndAddIntoProgramRulesList(tempProgramRule, finalProgramRulesList);
@@ -181,12 +178,11 @@ && isFineArtsOrAppliedSkillsRule(pr.getProgramRequirementCode().getProReqCode())
 
         logger.debug("Final Program rules list: {}",finalProgramRulesList);
         processReqMetAndNotMet(finalProgramRulesList,requirementsNotMet,finalCourseList,originalCourseRequirements,requirementsMet,gradProgramRulesMatch);        
-        ruleProcessorData.setMap1996Crse(map1996);
-        checkAppliedScienceAndFineArtsCondition(ruleProcessorData.getStudentCourses(),ruleProcessorData.getRequirementsMet(),ruleProcessorData.getNonGradReasons(),ruleProcessorData.getMap1996Crse());
+        checkAppliedScienceAndFineArtsCondition(ruleProcessorData.getStudentCourses(),ruleProcessorData.getRequirementsMet(),ruleProcessorData.getNonGradReasons());
         return ruleProcessorData;
     }
 
-    private void checkAppliedScienceAndFineArtsCondition(List<StudentCourse> studentCourses, List<GradRequirement> requirementsMet, List<GradRequirement> nonGradReasons, Map<String, Integer> map1996Crse) {
+    private void checkAppliedScienceAndFineArtsCondition(List<StudentCourse> studentCourses, List<GradRequirement> requirementsMet, List<GradRequirement> nonGradReasons) {
         boolean reqmtSatisfied = false;
         int counter = 0; //counter to keep track of fine arts and applied science rule codes
         for(GradRequirement gR:requirementsMet) {
@@ -215,15 +211,15 @@ private void checkAppliedScienceAndFineArtsCondition(List<StudentCourse> student
                     sc.setUsed(false);
                     sc.setUsedInMatchRule(false);
 
-                    if(map1996Crse.get(sc.getCourseCode()) != null) {
-                        map1996Crse.remove(sc.getCourseCode());
+                    if (sc.getLeftOverCredits() != null && sc.getLeftOverCredits() > 0) {
+                        sc.setLeftOverCredits(null);
                     }
                 }
             }
         }
     }
 
-    private void processCourse(StudentCourse tempCourse, List<CourseRequirement> tempCourseRequirements, ProgramRequirement tempProgramRule, List<GradRequirement> requirementsMet, List<ProgramRequirement> gradProgramRulesMatch, Map<String,Integer> map1996) {
+    private void processCourse(StudentCourse tempCourse, List<CourseRequirement> tempCourseRequirements, ProgramRequirement tempProgramRule, List<GradRequirement> requirementsMet, List<ProgramRequirement> gradProgramRulesMatch) {
     	if (!tempCourseRequirements.isEmpty() && tempProgramRule != null) {
             ProgramRequirement finalTempProgramRule = tempProgramRule;
             if (requirementsMet.stream()
@@ -254,7 +250,6 @@ private void processCourse(StudentCourse tempCourse, List<CourseRequirement> tem
                 if (tempProgramRule != null) {
                     if(tempCourse.getCredits() > Integer.parseInt(tempProgramRule.getProgramRequirementCode().getRequiredCredits())) {
                         int extraCredits = tempCourse.getCredits() - Integer.parseInt(tempProgramRule.getProgramRequirementCode().getRequiredCredits());
-                        map1996.put(tempCourse.getCourseCode(),extraCredits);
                         tempCourse.setLeftOverCredits(extraCredits);
                     }
                     setDetailsForCourses(tempCourse, tempProgramRule, requirementsMet);
diff --git a/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/MinCredit1996Rule.java b/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/MinCredit1996Rule.java
index dd9edf4c..f9f8c431 100644
--- a/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/MinCredit1996Rule.java
+++ b/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/MinCredit1996Rule.java
@@ -121,7 +121,9 @@ public void processReqMet(StudentCourse sc, ProgramRequirement gradProgramRule,
 		sc.setUsed(true);
         sc.setUsedInMinCreditRule(true);
         if (totalCredits > requiredCredits) {
-            sc.setLeftOverCredits(totalCredits - requiredCredits);
+            int leftOverCredit = totalCredits - requiredCredits;
+            sc.setCreditsUsedForGrad(sc.getCredits() - leftOverCredit);
+            sc.setLeftOverCredits(leftOverCredit);
         }
         AlgorithmSupportRule.setGradReqMet(sc,gradProgramRule);
     }
diff --git a/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/MinElectiveCredits1996Rule.java b/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/MinElectiveCredits1996Rule.java
index 64aeeea7..83feab9c 100644
--- a/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/MinElectiveCredits1996Rule.java
+++ b/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/MinElectiveCredits1996Rule.java
@@ -5,6 +5,7 @@
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.tuple.Pair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,7 +14,6 @@
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 @Data
@@ -33,23 +33,22 @@ public RuleData fire() {
 
 		List<GradRequirement> requirementsNotMet = new ArrayList<>();
 
-		Map<String,Integer> map1996 = ruleProcessorData.getMap1996Crse();
 		int ldCourseCounter = 0;
 		List<StudentCourse> tempStudentCourseList = RuleProcessorRuleUtils
 				.getUniqueStudentCourses(ruleProcessorData.getStudentCourses(), ruleProcessorData.isProjected());
 		List<StudentCourse> minCreditGrade12Courses = tempStudentCourseList.stream().filter(StudentCourse::isUsedInMinCreditRule).collect(Collectors.toList());
+		List<StudentCourse> minCreditGrade12CoursesWithLeftOverCredits = minCreditGrade12Courses.stream()
+				.filter(sc -> sc.isUsedInMinCreditRule() && (sc.getLeftOverCredits() != null && sc.getLeftOverCredits() > 0)).collect(Collectors.toList());
 		tempStudentCourseList.removeAll(minCreditGrade12Courses);
+		tempStudentCourseList.addAll(minCreditGrade12CoursesWithLeftOverCredits);
 		tempStudentCourseList.sort(Comparator.comparing(StudentCourse::getCompletedCoursePercentage).reversed());
 
-		List<StudentCourse> studentCourses = new ArrayList<>(minCreditGrade12Courses);
-		studentCourses.addAll(tempStudentCourseList);
-
 		List<ProgramRequirement> gradProgramRules = ruleProcessorData
 				.getGradProgramRules().stream().filter(gpr -> "MCE".compareTo(gpr.getProgramRequirementCode().getRequirementTypeCode().getReqTypeCode()) == 0
 						&& "Y".compareTo(gpr.getProgramRequirementCode().getActiveRequirement()) == 0 && "C".compareTo(gpr.getProgramRequirementCode().getRequirementCategory()) == 0)
 				.distinct().toList();
 
-		if (studentCourses.isEmpty()) {
+		if (minCreditGrade12Courses.isEmpty() && tempStudentCourseList.isEmpty()) {
 			logger.warn("!!!Empty list sent to Min Elective Credits Rule for processing");
 			AlgorithmSupportRule.processEmptyCourseCondition(ruleProcessorData,ruleProcessorData.getGradProgramRules(),requirementsNotMet);
 			return ruleProcessorData;
@@ -59,52 +58,15 @@ public RuleData fire() {
 			if(gradProgramRule.getProgramRequirementCode().getRequiredLevel() == null) {
 				requiredCredits = Integer.parseInt(gradProgramRule.getProgramRequirementCode().getRequiredCredits().trim()); // list
 
-				for (StudentCourse sc : studentCourses) {
-					if (map1996.get(sc.getCourseCode()) != null) {
-						if (sc.getCourseCode().startsWith("X")) {
-							if (ldCourseCounter < 8) {
-								ldCourseCounter += map1996.get(sc.getCourseCode());
-							} else {
-								continue;
-							}
-						}
-						if (totalCredits + map1996.get(sc.getCourseCode()) <= requiredCredits) {
-							totalCredits += map1996.get(sc.getCourseCode());
-							sc.setCreditsUsedForGrad(sc.getCreditsUsedForGrad() + map1996.get(sc.getCourseCode()));
-						} else {
-							int extraCredits = totalCredits + map1996.get(sc.getCourseCode()) - requiredCredits;
-							totalCredits = requiredCredits;
-							sc.setCreditsUsedForGrad(sc.getCreditsUsedForGrad() + map1996.get(sc.getCourseCode()) - extraCredits);
-						}
-						AlgorithmSupportRule.setGradReqMet(sc,gradProgramRule);
-						sc.setUsed(true);
-					} else {
-						if (!sc.isUsedInMatchRule()) {
-							boolean extraCreditsUsed = false;
-							int extraCreditsLDcrses = 0;
-							if (sc.getCourseCode().startsWith("X")) {
-								if (ldCourseCounter < 8) {
-									if (ldCourseCounter + sc.getCredits() <= 8) {
-										ldCourseCounter += sc.getCredits();
-									} else {
-										int extraCredits = ldCourseCounter + sc.getCredits() - 8;
-										ldCourseCounter += extraCredits;
-										extraCreditsLDcrses = extraCredits;
-										extraCreditsUsed = true;
-									}
-								} else {
-									continue;
-								}
-							}
-							totalCredits = AlgorithmSupportRule.processExtraCredits(extraCreditsUsed,extraCreditsLDcrses,sc,totalCredits,requiredCredits);
-							AlgorithmSupportRule.setGradReqMet(sc,gradProgramRule);
-							sc.setUsed(true);
-						}
-					}
-					if (totalCredits == requiredCredits) {
-						break;
-					}
-				}
+				// 1st: minGrade12CreditCourses
+				Pair<Integer, Integer> counts = handleStudentCourses(gradProgramRule, requiredCredits, minCreditGrade12Courses, totalCredits, ldCourseCounter, true);
+				totalCredits = counts.getLeft();
+				ldCourseCounter = counts.getRight();
+
+				// 2nd: the rest of courses + (minGrade12CreditCourses with leftOverCredit > 0)
+				counts = handleStudentCourses(gradProgramRule, requiredCredits, tempStudentCourseList, totalCredits, ldCourseCounter, false);
+				totalCredits = counts.getLeft();
+
 				AlgorithmSupportRule.checkCredits1996(totalCredits,requiredCredits,gradProgramRule,ruleProcessorData);
 				totalCredits = 0;
 			}
@@ -115,7 +77,59 @@ public RuleData fire() {
 		return ruleProcessorData;
 	}
 
-
+	private Pair<Integer, Integer> handleStudentCourses(ProgramRequirement gradProgramRule, Integer requiredCredits, List<StudentCourse> studentCourses,
+													   Integer totalCredits, Integer ldCourseCounter, boolean onlyMinGrade12CreditCourses) {
+		for (StudentCourse sc : studentCourses) {
+			if ((sc.isUsedInMatchRule() || sc.isUsedInMinCreditRule())
+					&& (sc.getLeftOverCredits() != null && sc.getLeftOverCredits() > 0)) {
+				if (sc.getCourseCode().startsWith("X")) {
+					if (ldCourseCounter < 8) {
+						ldCourseCounter += sc.getLeftOverCredits();
+					} else {
+						continue;
+					}
+				}
+				if (totalCredits + sc.getLeftOverCredits() <= requiredCredits) {
+					totalCredits += sc.getLeftOverCredits();
+					int credits = onlyMinGrade12CreditCourses? sc.getLeftOverCredits() : sc.getCreditsUsedForGrad() + sc.getLeftOverCredits();
+					sc.setCreditsUsedForGrad(credits > sc.getCredits() ? sc.getCredits() : credits);
+				} else {
+					int extraCredits = totalCredits + sc.getLeftOverCredits() - requiredCredits;
+					totalCredits = requiredCredits;
+					int credits = sc.getCreditsUsedForGrad() + sc.getLeftOverCredits() - extraCredits;
+					sc.setCreditsUsedForGrad(credits > sc.getCredits() ? sc.getCredits() : credits);
+				}
+				AlgorithmSupportRule.setGradReqMet(sc, gradProgramRule);
+				sc.setUsed(true);
+			} else {
+				if (!sc.isUsedInMatchRule()) {
+					boolean extraCreditsUsed = false;
+					int extraCreditsLDcrses = 0;
+					if (sc.getCourseCode().startsWith("X")) {
+						if (ldCourseCounter < 8) {
+							if (ldCourseCounter + sc.getCredits() <= 8) {
+								ldCourseCounter += sc.getCredits();
+							} else {
+								int extraCredits = ldCourseCounter + sc.getCredits() - 8;
+								ldCourseCounter += extraCredits;
+								extraCreditsLDcrses = extraCredits;
+								extraCreditsUsed = true;
+							}
+						} else {
+							continue;
+						}
+					}
+					totalCredits = AlgorithmSupportRule.processExtraCredits(extraCreditsUsed, extraCreditsLDcrses, sc, totalCredits, requiredCredits);
+					AlgorithmSupportRule.setGradReqMet(sc, gradProgramRule);
+					sc.setUsed(true);
+				}
+			}
+			if (totalCredits == requiredCredits) {
+				break;
+			}
+		}
+		return Pair.of(totalCredits, ldCourseCounter);
+	}
 
 	@Override
 	public void setInputData(RuleData inputData) {
diff --git a/api/src/test/resources/1950-122740988.json b/api/src/test/resources/1950-122740988.json
index 07fca819..401f53f7 100644
--- a/api/src/test/resources/1950-122740988.json
+++ b/api/src/test/resources/1950-122740988.json
@@ -619,7 +619,6 @@
     }
   ],
   "mapOptional": {},
-  "map1996Crse": null,
   "studentCourses": [
     {
       "pen": "122740988",
diff --git a/api/src/test/resources/1950-EN-2.json b/api/src/test/resources/1950-EN-2.json
index 036b37e7..bbb30ddf 100644
--- a/api/src/test/resources/1950-EN-2.json
+++ b/api/src/test/resources/1950-EN-2.json
@@ -619,7 +619,7 @@
     }
   ],
   "mapOptional": {},
-  "map1996Crse": null,
+
   "studentCourses": [
     {
       "pen": "120408505",
diff --git a/api/src/test/resources/1950-EN-3.json b/api/src/test/resources/1950-EN-3.json
index 036b37e7..bbb30ddf 100644
--- a/api/src/test/resources/1950-EN-3.json
+++ b/api/src/test/resources/1950-EN-3.json
@@ -619,7 +619,7 @@
     }
   ],
   "mapOptional": {},
-  "map1996Crse": null,
+
   "studentCourses": [
     {
       "pen": "120408505",
diff --git a/api/src/test/resources/1950-EN-4.json b/api/src/test/resources/1950-EN-4.json
index 036b37e7..bbb30ddf 100644
--- a/api/src/test/resources/1950-EN-4.json
+++ b/api/src/test/resources/1950-EN-4.json
@@ -619,7 +619,7 @@
     }
   ],
   "mapOptional": {},
-  "map1996Crse": null,
+
   "studentCourses": [
     {
       "pen": "120408505",
diff --git a/api/src/test/resources/1950-EN.json b/api/src/test/resources/1950-EN.json
index 69e933c8..08670f34 100644
--- a/api/src/test/resources/1950-EN.json
+++ b/api/src/test/resources/1950-EN.json
@@ -619,7 +619,7 @@
     }
   ],
   "mapOptional": {},
-  "map1996Crse": null,
+
   "studentCourses": [
     {
       "pen": "124428368",
diff --git a/api/src/test/resources/1986-EN-105581557.json b/api/src/test/resources/1986-EN-105581557.json
index fef8c082..e322a08f 100644
--- a/api/src/test/resources/1986-EN-105581557.json
+++ b/api/src/test/resources/1986-EN-105581557.json
@@ -554,7 +554,7 @@
     }
   ],
   "mapOptional": {},
-  "map1996Crse": null,
+
   "studentCourses": [
     {
       "pen": "105581557",
diff --git a/api/src/test/resources/1996-EN-101039378.json b/api/src/test/resources/1996-EN-101039378.json
index 0a189fe5..a661edfb 100644
--- a/api/src/test/resources/1996-EN-101039378.json
+++ b/api/src/test/resources/1996-EN-101039378.json
@@ -765,7 +765,7 @@
       "optionalProgramGraduated": true
     }
   },
-  "map1996Crse": null,
+
   "studentCourses": [
     {
       "pen": "101039378",
diff --git a/api/src/test/resources/1996-EN-101171718.json b/api/src/test/resources/1996-EN-101171718.json
index dd7c6773..82fcc098 100644
--- a/api/src/test/resources/1996-EN-101171718.json
+++ b/api/src/test/resources/1996-EN-101171718.json
@@ -684,7 +684,7 @@
     }
   ],
   "mapOptional": {},
-  "map1996Crse": null,
+
   "studentCourses": [
     {
       "pen": "101171718",
diff --git a/api/src/test/resources/1996-EN-101541068.json b/api/src/test/resources/1996-EN-101541068.json
index 7df5ba48..7bd2a22b 100644
--- a/api/src/test/resources/1996-EN-101541068.json
+++ b/api/src/test/resources/1996-EN-101541068.json
@@ -684,7 +684,7 @@
     }
   ],
   "mapOptional": {},
-  "map1996Crse": null,
+
   "studentCourses": [
     {
       "pen": "101541068",
diff --git a/api/src/test/resources/1996-EN-101821056.json b/api/src/test/resources/1996-EN-101821056.json
index 4945b81d..b11c168f 100644
--- a/api/src/test/resources/1996-EN-101821056.json
+++ b/api/src/test/resources/1996-EN-101821056.json
@@ -684,7 +684,7 @@
     }
   ],
   "mapOptional": {},
-  "map1996Crse": null,
+
   "studentCourses": [
     {
       "pen": "101821056",
diff --git a/api/src/test/resources/1996-EN-104337712.json b/api/src/test/resources/1996-EN-104337712.json
index 86b6393f..1f8d4abe 100644
--- a/api/src/test/resources/1996-EN-104337712.json
+++ b/api/src/test/resources/1996-EN-104337712.json
@@ -684,7 +684,7 @@
     }
   ],
   "mapOptional": {},
-  "map1996Crse": null,
+
   "studentCourses": [
     {
       "pen": "104337712",
diff --git a/api/src/test/resources/1996-EN-106945306.json b/api/src/test/resources/1996-EN-106945306.json
index 959861fd..bd7cbe9f 100644
--- a/api/src/test/resources/1996-EN-106945306.json
+++ b/api/src/test/resources/1996-EN-106945306.json
@@ -684,7 +684,7 @@
     }
   ],
   "mapOptional": {},
-  "map1996Crse": null,
+
   "studentCourses": [
     {
       "pen": "106945306",
diff --git a/api/src/test/resources/1996-EN-109491597.json b/api/src/test/resources/1996-EN-109491597.json
index 4dafb6db..7f15a5cc 100644
--- a/api/src/test/resources/1996-EN-109491597.json
+++ b/api/src/test/resources/1996-EN-109491597.json
@@ -833,7 +833,7 @@
       "optionalProgramGraduated": true
     }
   },
-  "map1996Crse": null,
+
   "studentCourses": [
     {
       "pen": "109491597",
diff --git a/api/src/test/resources/1996-PF-104573159.json b/api/src/test/resources/1996-PF-104573159.json
index 1519c23e..180ce1ad 100644
--- a/api/src/test/resources/1996-PF-104573159.json
+++ b/api/src/test/resources/1996-PF-104573159.json
@@ -778,7 +778,7 @@
       "optionalProgramGraduated": true
     }
   },
-  "map1996Crse": null,
+
   "studentCourses": [
     {
       "pen": "104573159",
diff --git a/api/src/test/resources/2004-EN-117346452.json b/api/src/test/resources/2004-EN-117346452.json
index 4dc91c65..edac5206 100644
--- a/api/src/test/resources/2004-EN-117346452.json
+++ b/api/src/test/resources/2004-EN-117346452.json
@@ -814,7 +814,7 @@
     }
   ],
   "mapOptional": {},
-  "map1996Crse": null,
+
   "studentCourses": [
     {
       "pen": "117346452",
diff --git a/api/src/test/resources/2018-EN-109496042.json b/api/src/test/resources/2018-EN-109496042.json
index 8de1bd30..28891369 100644
--- a/api/src/test/resources/2018-EN-109496042.json
+++ b/api/src/test/resources/2018-EN-109496042.json
@@ -957,7 +957,7 @@
     }
   ],
   "mapOptional": {},
-  "map1996Crse": null,
+
   "studentCourses": [
     {
       "pen": "109496042",
diff --git a/api/src/test/resources/2018-EN-123236440.json b/api/src/test/resources/2018-EN-123236440.json
index c06f5088..576d1ca3 100644
--- a/api/src/test/resources/2018-EN-123236440.json
+++ b/api/src/test/resources/2018-EN-123236440.json
@@ -957,7 +957,7 @@
     }
   ],
   "mapOptional": {},
-  "map1996Crse": null,
+
   "studentCourses": [
     {
       "pen": "123236440",
diff --git a/api/src/test/resources/2018-EN-126187616.json b/api/src/test/resources/2018-EN-126187616.json
index 4b8d38d3..c4c0052e 100644
--- a/api/src/test/resources/2018-EN-126187616.json
+++ b/api/src/test/resources/2018-EN-126187616.json
@@ -970,7 +970,7 @@
     }
   ],
   "mapOptional": {},
-  "map1996Crse": null,
+
   "studentCourses": [
     {
       "pen": "126187616",
diff --git a/api/src/test/resources/2018-EN-127970861.json b/api/src/test/resources/2018-EN-127970861.json
index 86f3d4c4..6a476b08 100644
--- a/api/src/test/resources/2018-EN-127970861.json
+++ b/api/src/test/resources/2018-EN-127970861.json
@@ -1208,7 +1208,7 @@
       "optionalProgramGraduated": true
     }
   },
-  "map1996Crse": null,
+
   "studentCourses": [
     {
       "pen": "127970861",
diff --git a/api/src/test/resources/2018-EN-DUP-ASSMT.json b/api/src/test/resources/2018-EN-DUP-ASSMT.json
index 954ebecf..107ee8cc 100644
--- a/api/src/test/resources/2018-EN-DUP-ASSMT.json
+++ b/api/src/test/resources/2018-EN-DUP-ASSMT.json
@@ -918,7 +918,7 @@
     }
   ],
   "mapOptional": {},
-  "map1996Crse": null,
+
   "studentCourses": [
     {
       "pen": "126889930",
diff --git a/api/src/test/resources/2018-EN-MIN-CREDIT-FAIL.json b/api/src/test/resources/2018-EN-MIN-CREDIT-FAIL.json
index a8a79f48..ce001a81 100644
--- a/api/src/test/resources/2018-EN-MIN-CREDIT-FAIL.json
+++ b/api/src/test/resources/2018-EN-MIN-CREDIT-FAIL.json
@@ -918,7 +918,7 @@
     }
   ],
   "mapOptional": {},
-  "map1996Crse": null,
+
   "studentCourses": [
     {
       "pen": "128310000",
diff --git a/api/src/test/resources/2018-EN-UNGRAD.json b/api/src/test/resources/2018-EN-UNGRAD.json
index b0d1d234..0b947712 100644
--- a/api/src/test/resources/2018-EN-UNGRAD.json
+++ b/api/src/test/resources/2018-EN-UNGRAD.json
@@ -918,7 +918,7 @@
     }
   ],
   "mapOptional": {},
-  "map1996Crse": null,
+
   "studentCourses": [
     {
       "pen": "136557584",
diff --git a/api/src/test/resources/2018-EN.json b/api/src/test/resources/2018-EN.json
index e0a5b35f..cd63588c 100644
--- a/api/src/test/resources/2018-EN.json
+++ b/api/src/test/resources/2018-EN.json
@@ -1169,7 +1169,7 @@
       "optionalProgramGraduated": true
     }
   },
-  "map1996Crse": null,
+
   "studentCourses": [
     {
       "pen": "126966100",
diff --git a/api/src/test/resources/2018-PF.json b/api/src/test/resources/2018-PF.json
index d22800a2..95fff0f4 100644
--- a/api/src/test/resources/2018-PF.json
+++ b/api/src/test/resources/2018-PF.json
@@ -1169,7 +1169,7 @@
       "optionalProgramGraduated": true
     }
   },
-  "map1996Crse": null,
+
   "studentCourses": [
     {
       "pen": "126885227",
diff --git a/api/src/test/resources/2023-EN-109496042.json b/api/src/test/resources/2023-EN-109496042.json
index 8de1bd30..28891369 100644
--- a/api/src/test/resources/2023-EN-109496042.json
+++ b/api/src/test/resources/2023-EN-109496042.json
@@ -957,7 +957,7 @@
     }
   ],
   "mapOptional": {},
-  "map1996Crse": null,
+
   "studentCourses": [
     {
       "pen": "109496042",
diff --git a/api/src/test/resources/DD-FAIL.json b/api/src/test/resources/DD-FAIL.json
index 9d00b5ec..505af976 100644
--- a/api/src/test/resources/DD-FAIL.json
+++ b/api/src/test/resources/DD-FAIL.json
@@ -1109,7 +1109,7 @@
       "optionalProgramGraduated": true
     }
   },
-  "map1996Crse": null,
+
   "studentCourses": [
     {
       "pen": "132641986",
diff --git a/api/src/test/resources/FI-126259126.json b/api/src/test/resources/FI-126259126.json
index e545de21..0e464d8d 100644
--- a/api/src/test/resources/FI-126259126.json
+++ b/api/src/test/resources/FI-126259126.json
@@ -1208,7 +1208,7 @@
       "optionalProgramGraduated": true
     }
   },
-  "map1996Crse": null,
+
   "studentCourses": [
     {
       "pen": "126259126",
diff --git a/api/src/test/resources/FI.json b/api/src/test/resources/FI.json
index a9bfc886..ec1a5d96 100644
--- a/api/src/test/resources/FI.json
+++ b/api/src/test/resources/FI.json
@@ -1169,7 +1169,7 @@
       "optionalProgramGraduated": true
     }
   },
-  "map1996Crse": null,
+
   "studentCourses": [
     {
       "pen": "126885227",
diff --git a/api/src/test/resources/SCCP-130319387-fail.json b/api/src/test/resources/SCCP-130319387-fail.json
index 7f5767bc..441b53bb 100644
--- a/api/src/test/resources/SCCP-130319387-fail.json
+++ b/api/src/test/resources/SCCP-130319387-fail.json
@@ -333,7 +333,7 @@
     }
   ],
   "mapOptional": {},
-  "map1996Crse": null,
+
   "studentCourses": [
     {
       "pen": "130319387",
diff --git a/api/src/test/resources/SCCP-130319387.json b/api/src/test/resources/SCCP-130319387.json
index 47ae6b21..08d92aca 100644
--- a/api/src/test/resources/SCCP-130319387.json
+++ b/api/src/test/resources/SCCP-130319387.json
@@ -333,7 +333,7 @@
     }
   ],
   "mapOptional": {},
-  "map1996Crse": null,
+
   "studentCourses": [
     {
       "pen": "130319387",