diff --git a/tests/resources/log4j.xml b/tests/resources/log4j.xml
deleted file mode 100644
index e3ba85425e..0000000000
--- a/tests/resources/log4j.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-    <appender name="ConsoleAppender" class="org.apache.log4j.ConsoleAppender">
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%-5p %d [%t] %c{1}: %m%n" />
-        </layout>
-    </appender>
-    
-    <!-- Less verbose logging for COTS -->
-    <category name="org.springframework">
-        <priority value="WARN" />
-    </category>
-
-    <category name="org.hibernate">
-        <priority value="WARN" />
-    </category>
-    
-    <root>
-        <priority value="INFO" />
-        <appender-ref ref="ConsoleAppender" />
-    </root>
-</log4j:configuration>
\ No newline at end of file
diff --git a/tests/resources/logback-test.xml b/tests/resources/logback-test.xml
new file mode 100644
index 0000000000..26f98cbf78
--- /dev/null
+++ b/tests/resources/logback-test.xml
@@ -0,0 +1,53 @@
+<configuration debug="false" scan="false">
+   <appender name="console" class="ch.qos.logback.core.ConsoleAppender"> 
+      <encoder> 
+         <pattern>%-5p %d [%t] %c{0}: %m%n</pattern> 
+      </encoder>
+      <filter class="com.raytheon.uf.common.status.logback.InvertedThresholdFilter">
+         <level>INFO</level>         
+      </filter>
+   </appender>
+
+   <appender name="errConsole" class="ch.qos.logback.core.ConsoleAppender">
+      <target>System.err</target>
+      <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+        <level>WARN</level>
+      </filter> 
+      <encoder> 
+         <pattern>%-5p %d [%t] %c{0}: %m%n</pattern> 
+      </encoder>
+   </appender>
+   
+   <logger name="com.raytheon">
+      <level value="INFO"/>
+   </logger>
+      <logger name="org.apache">
+      <level value="WARN"/>
+   </logger>
+   <logger name="org.apache.activemq.spring">
+      <level value="WARN"/>
+   </logger>
+   <logger name="org.apache.commons.beanutils">
+      <level value="WARN"/>
+   </logger>
+   <logger name="org.apache.qpid">
+      <level value="WARN"/>
+   </logger>
+   <logger name="org.geotools">
+      <level value="WARN"/>
+   </logger>
+   <logger name="org.apache.xbean.spring">
+      <level value="WARN"/>
+   </logger>
+   <logger name="org.springframework">
+      <level value="WARN"/>
+   </logger>
+   <logger name="uk.ltd.getahead">
+      <level value="WARN"/>
+   </logger>
+   <root> 
+      <level value="INFO"/> 
+      <appender-ref ref="console"/> 
+      <appender-ref ref="errConsole"/>
+    </root> 
+</configuration>
\ No newline at end of file
diff --git a/tests/unit/com/raytheon/uf/common/util/ReflectionUtilTest.java b/tests/unit/com/raytheon/uf/common/util/ReflectionUtilTest.java
index c3288f93ec..fd0ba7ff52 100644
--- a/tests/unit/com/raytheon/uf/common/util/ReflectionUtilTest.java
+++ b/tests/unit/com/raytheon/uf/common/util/ReflectionUtilTest.java
@@ -24,7 +24,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 
@@ -39,7 +38,8 @@ import org.junit.Test;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Jul 10, 2012 634        djohnson     Initial creation
+ * Jul 10, 2012  634       djohnson    Initial creation
+ * Jul 08, 2013 2173       mpduff      Update to work with Java 1.7.
  * 
  * </pre>
  * 
@@ -94,7 +94,7 @@ public class ReflectionUtilTest {
 
     @Test
     public void testGetterRetrievesIsPrefixedValue() {
-        List<String> list = Collections.emptyList();
+        List<String> list = new ArrayList<String>(0);
 
         boolean value = (Boolean) ReflectionUtil.getter(list, "empty");
 
diff --git a/tests/unit/com/raytheon/uf/edex/datadelivery/retrieval/LinkStoreTest.java b/tests/unit/com/raytheon/uf/edex/datadelivery/retrieval/LinkStoreTest.java
index 47962ebff2..d79b69cd78 100644
--- a/tests/unit/com/raytheon/uf/edex/datadelivery/retrieval/LinkStoreTest.java
+++ b/tests/unit/com/raytheon/uf/edex/datadelivery/retrieval/LinkStoreTest.java
@@ -42,6 +42,7 @@ import org.junit.Test;
  * ------------ ---------- ----------- --------------------------
  * Jul 26, 2012 955        djohnson     Initial creation
  * Sep 11, 2012 1154       djohnson     Test JAXB marshall/unmarshall.
+ * Jul 08, 2013 2173       mpduff       Change to look at xml values, not the xml itself.
  * 
  * </pre>
  * 
@@ -97,27 +98,24 @@ public class LinkStoreTest {
         Writer writer = new StringWriter();
         context.createMarshaller().marshal(linkStore, writer);
 
-        final String expectedXml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"
-                + "<linkStore creationTime=\""
-                + creationTime
-                + "\" date=\"1969-12-31T18:00:00.00" + creationTime + "-06:00\" dateString=\""
-                + dateString
-                + "\">"
-                + "<links><entry><key xsi:type=\"xs:string\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" "
-                + "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">urlOne</key>"
-                + "<value xsi:type=\"link\" url=\""
-                + linkUrl
-                + "\" name=\""
-                + linkName
-                + "\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"/>"
-                + "</entry></links></linkStore>";
-
-        assertEquals("The marshalled XML did not match what was expected!",
-                expectedXml, writer.toString());
-
         LinkStore restored = (LinkStore) context.createUnmarshaller()
-                .unmarshal(
-                new StringReader(writer.toString()));
+                .unmarshal(new StringReader(writer.toString()));
+
+        Link link2 = restored.getLink(LinkStore.getLinkKey(linkStoreLink));
+
+        assertEquals("Links do not match", link, link2);
+
+        assertEquals("Names do not match", link.getName(), link2.getName());
+
+        assertEquals("URLs do not match", link.getUrl(), link2.getUrl());
+
+        assertEquals("Creation Times do not match",
+                linkStore.getCreationTime(), restored.getCreationTime());
+
+        assertEquals("Date Strings do not match", linkStore.getDateString(),
+                restored.getDateString());
+        assertEquals("Dates do not match", linkStore.getDate(),
+                restored.getDate());
 
         assertEquals(
                 "The jaxb unmarshalled version should have been equal to the original!",