Cleaned up some tests - more work to do to get some additional tests working in R4.

src/main/java/ca/uhn/fhir/jpa/starter/cql/StarterCqlR4Config.java

@@ -1,10 +1,11 @@
 package ca.uhn.fhir.jpa.starter.cql;
 
 import ca.uhn.fhir.cql.config.CqlR4Config;
+import ca.uhn.fhir.jpa.starter.annotations.OnR4Condition;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Import;
 
-@Conditional({CqlConfigCondition.class})
+@Conditional({OnR4Condition.class, CqlConfigCondition.class})
 @Import({CqlR4Config.class})
 public class StarterCqlR4Config {
 }