diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 33bda77..9014f81 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -107,4 +107,22 @@
     </plugins>
   </build>
 
+  <profiles>
+    <profile>
+      <activation>
+        <property>
+          <name>axis2.version</name>
+          <value>SNAPSHOT</value>
+        </property>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.axis2</groupId>
+          <artifactId>axis2-transport-http</artifactId>
+          <version>${axis2.version}</version>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
 </project>
diff --git a/modules/core/src/main/java/org/apache/savan/atom/AtomEventingClient.java b/modules/core/src/main/java/org/apache/savan/atom/AtomEventingClient.java
index 44d4b16..9d75214 100644
--- a/modules/core/src/main/java/org/apache/savan/atom/AtomEventingClient.java
+++ b/modules/core/src/main/java/org/apache/savan/atom/AtomEventingClient.java
@@ -16,10 +16,10 @@
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.ConfigurationContextFactory;
 import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.commons.httpclient.methods.RequestEntity;
-import org.apache.http.HttpStatus;
 import org.apache.savan.SavanException;
 import org.apache.savan.eventing.EventingConstants;
 import org.apache.savan.filters.XPathBasedFilter;
diff --git a/modules/core/src/main/java/org/apache/savan/atom/AtomMessageReceiver.java b/modules/core/src/main/java/org/apache/savan/atom/AtomMessageReceiver.java
index ef06cd8..e1b85b7 100644
--- a/modules/core/src/main/java/org/apache/savan/atom/AtomMessageReceiver.java
+++ b/modules/core/src/main/java/org/apache/savan/atom/AtomMessageReceiver.java
@@ -101,10 +101,7 @@
                 outMsgContext.getOperationContext().addMessageContext(outMsgContext);
                 outMsgContext.setEnvelope(envelope);
 
-                AxisEngine engine =
-                        new AxisEngine(
-                                outMsgContext.getConfigurationContext());
-                engine.send(outMsgContext);
+                AxisEngine.send(outMsgContext);
 
             } else if (HTTPConstants.HEADER_POST.equals(request.getMethod())) {
                 SOAPEnvelope envlope = messageCtx.getEnvelope();
diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml
index 765077a..e78b04f 100755
--- a/modules/samples/pom.xml
+++ b/modules/samples/pom.xml
@@ -56,4 +56,21 @@
     </plugins>
   </build>
 
+  <profiles>
+    <profile>
+      <activation>
+        <property>
+          <name>axis2.version</name>
+          <value>SNAPSHOT</value>
+        </property>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.axis2</groupId>
+          <artifactId>axis2-transport-http</artifactId>
+          <version>${axis2.version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
 </project>
diff --git a/pom.xml b/pom.xml
index 547ae19..299b0d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,6 +92,12 @@
             <version>2.2.0</version>
         </dependency>
 		
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.2</version>
+            <scope>test</scope>
+        </dependency>
 		
 	</dependencies>