diff --git a/src/test/java/com/syncleus/tutorial/jackrabbit/hello/AppTest.java b/src/test/java/com/syncleus/tutorial/jackrabbit/hello/AppTest.java
index 2a3e966ba353e914043ec8dc10925a2d44564cd0..d662c37e26fdf54efa79d1b7f9fb8438cb24de06 100644
--- a/src/test/java/com/syncleus/tutorial/jackrabbit/hello/AppTest.java
+++ b/src/test/java/com/syncleus/tutorial/jackrabbit/hello/AppTest.java
@@ -1,5 +1,6 @@
 package com.syncleus.tutorial.jackrabbit.hello;
 
+import junit.framework.Assert;
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
@@ -19,6 +20,7 @@ import org.apache.jackrabbit.core.TransientRepository;
 public class AppTest 
     extends TestCase
 {
+    private static final String MESSAGE = "Hello, World!";
     /**
      * Create the test case
      *
@@ -45,14 +47,25 @@ public class AppTest
     	Repository repo = new TransientRepository();
     	Session session = repo.login(
     			new SimpleCredentials("admin","admin".toCharArray()));
-    	Node root = session.getRootNode();
-    	
-    	NodeIterator i = root.getNodes();
-    	while(i.hasNext()){
-    		Node node = i.nextNode();
-    		System.out.println(node.getName());
+    	try {
+            Node root = session.getRootNode();
+
+            // Store content 
+            Node hello = root.addNode("hello"); 
+            Node world = hello.addNode("world"); 
+            world.setProperty("message", MESSAGE);
+            session.save(); 
+
+            // Retrieve content 
+            Node node = root.getNode("hello/world");
+            Assert.assertEquals(MESSAGE, node.getProperty("message").getString());
+
+            // Remove content 
+            root.getNode("hello").remove(); 
+            session.save(); 
     	}
-    	
-        session.logout();
+        finally {
+            session.logout();
+        }
     }
 }