diff --git a/metadata-templates/src/main/java/org/irods/jargon/metadatatemplate/JargonMetadataResolver.java b/metadata-templates/src/main/java/org/irods/jargon/metadatatemplate/JargonMetadataResolver.java
index 7992746..f804130 100644
--- a/metadata-templates/src/main/java/org/irods/jargon/metadatatemplate/JargonMetadataResolver.java
+++ b/metadata-templates/src/main/java/org/irods/jargon/metadatatemplate/JargonMetadataResolver.java
@@ -282,8 +282,6 @@ public MetadataTemplate findTemplateByNameInPublicTemplates(final String name) t
 
 		MetadataTemplate returnTemplate = null;
 		IRODSFile collectionIrodsFile = null;
-		boolean matched = false;
-
 		// for (String publicDir : getPublicTemplateLocations()) {
 		try {
 			collectionIrodsFile = this.getIrodsAccessObjectFactory()
@@ -301,7 +299,6 @@ public MetadataTemplate findTemplateByNameInPublicTemplates(final String name) t
 
 				try {
 					returnTemplate = processFileToMetadataTemplate((IRODSFile) f);
-					matched = true;
 				} catch (JargonException je) {
 					log.error("JargonException in processFileToMetadataTemplate", je);
 					log.info("Matched {} with {}, but file could not be processed", name, f.getAbsolutePath());
@@ -451,6 +448,7 @@ private String generateMdTemplateFileName() {
 		StringBuilder sb = new StringBuilder();
 		sb.append("mdtemplate");
 		sb.append(System.currentTimeMillis());
+		sb.append(MetadataTemplateConstants.TEMPLATE_FILE_EXT);
 		return sb.toString();
 	}
 
diff --git a/metadata-templates/src/test/java/org/irods/jargon/metadatatemplate/JargonMetadataResolverTest.java b/metadata-templates/src/test/java/org/irods/jargon/metadatatemplate/JargonMetadataResolverTest.java
index 39a7b8a..f2f635a 100644
--- a/metadata-templates/src/test/java/org/irods/jargon/metadatatemplate/JargonMetadataResolverTest.java
+++ b/metadata-templates/src/test/java/org/irods/jargon/metadatatemplate/JargonMetadataResolverTest.java
@@ -158,6 +158,7 @@ public void testListPublic() throws Exception {
 
 		JargonMetadataResolver resolver = new JargonMetadataResolver(context, accessObjectFactory,
 				metadataConfiguration);
+		UUID uuid = resolver.saveTemplate(template, MetadataTemplateLocationTypeEnum.PUBLIC);
 
 		List<MetadataTemplate> metadataTemplates = resolver.listPublicTemplates();