Merge branch 'biosimulations_fixes' of https://github.com/virtualcell/vcell into biosimulations_fixes

Author: CodeByDrescher

vcell-cli/src/test/java/org/vcell/cli/run/BSTSBasedOmexExecTest.java

@@ -135,9 +135,10 @@ public static Collection<String> testCases() {
 		Set<String> modelsToFilter = new HashSet<>();
 		Predicate<String> filter;
 
-		modelsToFilter.addAll(needToCurateModels());
+		modelsToFilter.addAll(needToCurateModels()); // Comment out if checking that current version will satisfy BSTS
 		modelsToFilter.addAll(blacklistedModels());
 		filter = (t) -> !modelsToFilter.contains(t);
+
 		return Arrays.stream(BSTSBasedTestSuiteFiles.getBSTSTestCases()).filter(filter).collect(Collectors.toList());
 	}
 

vcell-core/src/main/java/org/vcell/sedml/SEDMLImporter.java

@@ -826,11 +826,10 @@ private BioModel getModelReference(String referenceId, Model model, Map<String,
 				throw new RuntimeException("The parent hasn't been processed yet!");
 
 			canTranslate = this.canTranslateToOverrides(parentBiomodel, model);
-			return !model.getListOfChanges().isEmpty() && canTranslate ?
-					parentBiomodel : this.importModel(model);
-		} else {
-			return this.importModel(model);
+			if (canTranslate)
+				return parentBiomodel;
 		}
+			return this.importModel(model);
 	}
 
 	private boolean canTranslateToOverrides(BioModel refBM, Model mm) {