diff --git a/build.versions b/build.versions
index 59325be..49caddd 100644
--- a/build.versions
+++ b/build.versions
@@ -14,5 +14,5 @@
 # Test
 org.junit=4.7.0
 org.easymock=2.3.0
-org.eclipse.virgo.test=3.6.0.D-20120817023334
-org.eclipse.virgo.util=3.6.0.D-20120817023043
+org.eclipse.virgo.test=3.6.0.D-20120820125548
+org.eclipse.virgo.util=3.6.0.D-20120820124944
diff --git a/org.eclipse.virgo.medic.core/.classpath b/org.eclipse.virgo.medic.core/.classpath
index 17bfd83..83618e8 100644
--- a/org.eclipse.virgo.medic.core/.classpath
+++ b/org.eclipse.virgo.medic.core/.classpath
@@ -28,11 +28,11 @@
 	<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/MEDIC_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.medic"/>
-	<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.D-20120817023334/org.eclipse.virgo.test.stubs-3.6.0.D-20120817023334.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.6.0.D-20120711092322/org.eclipse.virgo.teststubs.osgi-sources-3.6.0.D-20120711092322.jar"/>
+	<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.D-20120820125548/org.eclipse.virgo.test.stubs-3.6.0.D-20120820125548.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.6.0.D-20120711092322/org.eclipse.virgo.teststubs.osgi-sources-3.6.0.D-20120711092322.jar"/>
 	<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-1.6.12.RELEASE.jar" sourcepath="/MEDIC_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-sources-1.6.12.RELEASE.jar"/>
-	<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.0.D-20120817023043/org.eclipse.virgo.util.osgi-3.6.0.D-20120817023043.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.0.D-20120817023043/org.eclipse.virgo.util.osgi-sources-3.6.0.D-20120817023043.jar"/>
+	<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.0.D-20120820124944/org.eclipse.virgo.util.osgi-3.6.0.D-20120820124944.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.0.D-20120820124944/org.eclipse.virgo.util.osgi-sources-3.6.0.D-20120820124944.jar"/>
 	<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
-	<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120817023043/org.eclipse.virgo.util.io-3.6.0.D-20120817023043.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120817023043/org.eclipse.virgo.util.io-sources-3.6.0.D-20120817023043.jar"/>
+	<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120820124944/org.eclipse.virgo.util.io-3.6.0.D-20120820124944.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120820124944/org.eclipse.virgo.util.io-sources-3.6.0.D-20120820124944.jar"/>
 	<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.mirrored/ch.qos.logback.classic/1.0.0.v20111214-2030/ch.qos.logback.classic-1.0.0.v20111214-2030.jar"/>
 	<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.mirrored/ch.qos.logback.core/1.0.0.v20111214-2030/ch.qos.logback.core-1.0.0.v20111214-2030.jar"/>
 	<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.cm/1.0.400.v20120319-2029/org.eclipse.equinox.cm-1.0.400.v20120319-2029.jar"/>
diff --git a/org.eclipse.virgo.medic.integrationtest/.classpath b/org.eclipse.virgo.medic.integrationtest/.classpath
index 72e252e..a6304e2 100644
--- a/org.eclipse.virgo.medic.integrationtest/.classpath
+++ b/org.eclipse.virgo.medic.integrationtest/.classpath
@@ -26,14 +26,14 @@
 	<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.6.4.v20120130-2120/org.slf4j.api-1.6.4.v20120130-2120.jar" sourcepath="/MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
 	<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.mirrored/ch.qos.logback.classic/1.0.0.v20111214-2030/ch.qos.logback.classic-1.0.0.v20111214-2030.jar" sourcepath="/MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.classic/0.9.24/com.springsource.ch.qos.logback.classic-sources-0.9.24.jar"/>
 	<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.mirrored/ch.qos.logback.core/1.0.0.v20111214-2030/ch.qos.logback.core-1.0.0.v20111214-2030.jar" sourcepath="/MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.core/0.9.24/com.springsource.ch.qos.logback.core-sources-0.9.24.jar"/>
-	<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.D-20120817023334/org.eclipse.virgo.test.stubs-3.6.0.D-20120817023334.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.6.0.D-20120817023334/org.eclipse.virgo.test.framework-sources-3.6.0.D-20120817023334.jar"/>
+	<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.D-20120820125548/org.eclipse.virgo.test.stubs-3.6.0.D-20120820125548.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.6.0.D-20120820125548/org.eclipse.virgo.test.framework-sources-3.6.0.D-20120820125548.jar"/>
 	<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
 	<classpathentry kind="src" path="/org.eclipse.virgo.medic">
 		<attributes>
 			<attribute name="org.eclipse.ajdt.aspectpath" value="org.eclipse.ajdt.aspectpath"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120817023043/org.eclipse.virgo.util.common-3.6.0.D-20120817023043.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120817023043/org.eclipse.virgo.util.common-sources-3.6.0.D-20120817023043.jar"/>
+	<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120820124944/org.eclipse.virgo.util.common-3.6.0.D-20120820124944.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120820124944/org.eclipse.virgo.util.common-sources-3.6.0.D-20120820124944.jar"/>
 	<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.cm/1.0.400.v20120319-2029/org.eclipse.equinox.cm-1.0.400.v20120319-2029.jar"/>
 	<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi.services/3.3.0.v20120307-2102/org.eclipse.osgi.services-3.3.0.v20120307-2102.jar"/>
 	<classpathentry kind="output" path="target/classes"/>