diff --git a/config/acme/machines/Makefile b/config/acme/machines/Makefile
index 61756f94150..b3d1808a830 100644
--- a/config/acme/machines/Makefile
+++ b/config/acme/machines/Makefile
@@ -90,12 +90,7 @@ ifeq ($(USE_ESMF_LIB), TRUE)
    CPPDEFS += -DUSE_ESMF_LIB
 endif
 
-# ESMF_INTERFACE is currently only defined in env_build.xml
-ifeq ($(COMP_INTERFACE), ESMF)
-   CPPDEFS += -DESMF_INTERFACE
-else
-   CPPDEFS += -DMCT_INTERFACE
-endif
+CPPDEFS += -DMCT_INTERFACE
 
 ifeq ($(strip $(MPILIB)),mpi-serial)
   CPPDEFS += -DNO_MPI2
@@ -351,6 +346,7 @@ else
   endif
 endif
 
+COMP_INTERFACE := $(shell echo $(COMP_INTERFACE) | tr A-Z a-z)
 #===============================================================================
 # Set include paths (needed after override for any model specific builds below)
 #===============================================================================
diff --git a/config/cesm/machines/Makefile b/config/cesm/machines/Makefile
index 07bac97afb8..48898b87785 100644
--- a/config/cesm/machines/Makefile
+++ b/config/cesm/machines/Makefile
@@ -88,12 +88,7 @@ ifeq ($(USE_ESMF_LIB), TRUE)
    CPPDEFS += -DUSE_ESMF_LIB
 endif
 
-# ESMF_INTERFACE is currently only defined in env_build.xml
-ifeq ($(COMP_INTERFACE), ESMF)
-   CPPDEFS += -DESMF_INTERFACE
-else
-   CPPDEFS += -DMCT_INTERFACE
-endif
+COMP_INTERFACE := $(shell echo $(COMP_INTERFACE) | tr A-Z a-z)
 
 ifeq ($(strip $(MPILIB)),mpi-serial)
   CPPDEFS += -DNO_MPI2
diff --git a/scripts/lib/CIME/SystemTests/system_tests_common.py b/scripts/lib/CIME/SystemTests/system_tests_common.py
index d0898923b55..391508320a5 100644
--- a/scripts/lib/CIME/SystemTests/system_tests_common.py
+++ b/scripts/lib/CIME/SystemTests/system_tests_common.py
@@ -480,16 +480,13 @@ def build_phase(self, sharedlib_only=False, model_only=False):
 """
 echo Insta pass
 echo SUCCESSFUL TERMINATION > {}/cpl.log.$LID
-cp {}/scripts/tests/cpl.hi1.nc.test {}/{}.cpl.hi.0.nc.base
+cp {}/scripts/tests/cpl.hi1.nc.test {}/{}.cpl.hi.0.nc
 cp {}/scripts/tests/cpl.hi2.nc.test {}/{}.cpl.hi.0.nc.rest
 """.format(rundir, cimeroot, rundir, case, cimeroot, rundir, case)
         self._set_script(script)
         super(TESTTESTDIFF, self).build_phase(sharedlib_only=sharedlib_only,
                                               model_only=model_only)
 
-    def run_indv(self, suffix=None, st_archive=False ):
-        super(TESTTESTDIFF,self).run_indv(suffix, st_archive)
-
     def run_phase(self):
         super(TESTTESTDIFF, self).run_phase()
         self._component_compare_test("base", "rest")
diff --git a/scripts/lib/CIME/XML/machines.py b/scripts/lib/CIME/XML/machines.py
index 675908e80f9..afc33856cfa 100644
--- a/scripts/lib/CIME/XML/machines.py
+++ b/scripts/lib/CIME/XML/machines.py
@@ -163,7 +163,7 @@ def set_machine(self, machine):
             self.machine = machine
 
         return machine
-
+    #pylint: disable=arguments-differ
     def get_value(self, name, attributes=None, resolved=True, subgroup=None):
         """
         Get Value of fields in the config_machines.xml file