diff --git a/pom.xml b/pom.xml
index 7acf909..1e756c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,6 +83,7 @@
 
     <build>
         <plugins>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -92,11 +93,13 @@
                     <target>1.6</target>
                 </configuration>
             </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
                 <version>2.4.1</version>
             </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
@@ -109,6 +112,7 @@
                     </execution>
                 </executions>
             </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
@@ -124,11 +128,13 @@
                     </execution>
                 </executions>
             </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
                 <version>3.3</version>
             </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-scm-publish-plugin</artifactId>
@@ -139,16 +145,19 @@
                     <content>${project.build.directory}/site</content>
                 </configuration>
             </plugin>
+
         </plugins>
     </build>
 
     <reporting>
         <plugins>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
                 <version>2.6</version>
             </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
@@ -169,6 +178,7 @@
                     </reportSet>
                 </reportSets>
             </plugin>
+
         </plugins>
     </reporting>
 
diff --git a/src/test/java/org/rometools/propono/atom/client/AtomClientTest.java b/src/test/java/org/rometools/propono/atom/client/AtomClientTest.java
index 0db9a17..801f7b0 100644
--- a/src/test/java/org/rometools/propono/atom/client/AtomClientTest.java
+++ b/src/test/java/org/rometools/propono/atom/client/AtomClientTest.java
@@ -32,10 +32,12 @@ import org.rometools.propono.utils.ProponoException;
 
 import com.sun.syndication.feed.atom.Category;
 import com.sun.syndication.feed.atom.Content;
+import org.junit.Ignore;
 
 /**
  * Simple APP test designed to run against a live Atom server.
  */
+@Ignore
 public class AtomClientTest extends TestCase {
 
     private static Log log = LogFactory.getFactory().getInstance(AtomClientTest.class);
diff --git a/src/test/java/org/rometools/propono/atom/client/BloggerDotComTest.java b/src/test/java/org/rometools/propono/atom/client/BloggerDotComTest.java
index a0b9f23..a8a9d0f 100644
--- a/src/test/java/org/rometools/propono/atom/client/BloggerDotComTest.java
+++ b/src/test/java/org/rometools/propono/atom/client/BloggerDotComTest.java
@@ -22,10 +22,12 @@ import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
 import com.sun.syndication.feed.atom.Content;
+import org.junit.Ignore;
 
 /**
  * Simple APP test designed to run against Blogger.com.
  */
+@Ignore
 public class BloggerDotComTest extends TestCase {
 
     private final String collectionURI = "http://www.blogger.com/feeds/BLOGID/posts/default";
diff --git a/src/test/java/org/rometools/propono/atom/common/AtomServiceTest.java b/src/test/java/org/rometools/propono/atom/common/AtomServiceTest.java
index 1696e0e..e88d7b3 100644
--- a/src/test/java/org/rometools/propono/atom/common/AtomServiceTest.java
+++ b/src/test/java/org/rometools/propono/atom/common/AtomServiceTest.java
@@ -58,7 +58,7 @@ public class AtomServiceTest extends TestCase {
         try {
             // Load service document from disk
             final SAXBuilder builder = new SAXBuilder();
-            final Document document = builder.build(new FileInputStream("./servicedoc1.xml"));
+            final Document document = builder.build(this.getClass().getResourceAsStream("/servicedoc1.xml"));
             assertNotNull(document);
             final AtomService service = AtomService.documentToService(document);
 
diff --git a/src/test/java/org/rometools/propono/atom/server/AtomClientServerTest.java b/src/test/java/org/rometools/propono/atom/server/AtomClientServerTest.java
index 20922ec..0f5531e 100644
--- a/src/test/java/org/rometools/propono/atom/server/AtomClientServerTest.java
+++ b/src/test/java/org/rometools/propono/atom/server/AtomClientServerTest.java
@@ -22,16 +22,19 @@ import java.util.logging.Logger;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.Ignore;
 
 import org.mortbay.http.HttpContext;
 import org.mortbay.http.HttpServer;
 import org.mortbay.http.SocketListener;
 import org.mortbay.jetty.servlet.ServletHandler;
+import org.rometools.propono.atom.client.AtomClientTest;
 
 /**
  * Test Propono Atom Client against Atom Server via Jetty. Extends <code>AtomClientTest</code> to start Jetty server, run tests and then stop the Jetty server.
  */
-public class AtomClientServerTest { // extends AtomClientTest {
+@Ignore
+public class AtomClientServerTest extends AtomClientTest {
 
     private HttpServer server;
     public static final int TESTPORT = 8283;
@@ -40,17 +43,20 @@ public class AtomClientServerTest { // extends AtomClientTest {
     public static final String PASSWORD = "admin";
 
     public AtomClientServerTest(final String s) {
-        // super(s);
+        super(s);
     }
 
+    @Override
     public String getEndpoint() {
         return ENDPOINT;
     }
 
+    @Override
     public String getUsername() {
         return USERNAME;
     }
 
+    @Override
     public String getPassword() {
         return PASSWORD;
     }
diff --git a/src/test/java/org/rometools/propono/blogclient/SimpleBlogClientTest.java b/src/test/java/org/rometools/propono/blogclient/SimpleBlogClientTest.java
index e66972d..fd036e8 100644
--- a/src/test/java/org/rometools/propono/blogclient/SimpleBlogClientTest.java
+++ b/src/test/java/org/rometools/propono/blogclient/SimpleBlogClientTest.java
@@ -25,10 +25,12 @@ import junit.framework.TestSuite;
 import org.rometools.propono.utils.Utilities;
 
 import com.sun.syndication.io.impl.Atom10Parser;
+import org.junit.Ignore;
 
 /**
  * Tests Atom and MetaWeblog API CRUD via BlogClient. Exclude this from automated tests because it requires a live blog server.
  */
+@Ignore
 public class SimpleBlogClientTest extends TestCase {
 
     private final String metaweblogEndpoint = "http://localhost:8080/roller/roller-services/xmlrpc";