diff --git a/api/src/com/cloud/offering/OfferingManager.java b/api/src/com/cloud/offering/OfferingManager.java
index cae911ce77a..671dbea8aad 100644
--- a/api/src/com/cloud/offering/OfferingManager.java
+++ b/api/src/com/cloud/offering/OfferingManager.java
@@ -18,9 +18,14 @@
 package com.cloud.offering;
 
 /**
+ * An offering is a package of features offered to the end user.  OfferingManager
+ * is responsible for the life cycle of the offerings available from CloudStack.
+ * An administrator can create, delete, enable, and disable offerings.  
  * 
- * OfferingManager manages the different type of service offerings 
- * available to the administrators of the system. 
+ * There are three types of offerings:
+ *   - Service Offering - package of computing power and the root disk.
+ *   - Disk Offering - package of disk performance and size specification.
+ *   - Network Offering - package of services available on a network.
  *
  */
 public interface OfferingManager {
@@ -29,18 +34,16 @@ public interface OfferingManager {
      * @return ServiceOffering
      */
     ServiceOffering createServiceOffering();
-    
+
     /**
      * Creates a disk offering.
      * @return DiskOffering
      */
     DiskOffering createDiskOffering();
-    
+
     /**
      * Creates a network offering.
      * @return NetworkOffering
      */
     NetworkOffering createNetworkOffering();
-    
-
 }
diff --git a/build/build-cloud.xml b/build/build-cloud.xml
index d03eb7fa6e2..728f5a42fe0 100755
--- a/build/build-cloud.xml
+++ b/build/build-cloud.xml
@@ -13,7 +13,6 @@
     -->
   <dirname property="base.dir" file="${ant.file.Cloud Stack}/.." />
   <property name="build.dir" location="${base.dir}/build" />
-  <property name="test.classes.dir" location="${test.target.dir}/classes" />
 
   <!-- Import anything that the user wants to set-->
   <!-- Import properties files and environment variables here -->
@@ -102,9 +101,6 @@
   <property name="console-viewer.dir" location="${base.dir}/console-viewer" />
   <property name="console-viewer.dist.dir" location="${dist.dir}/console-viewer" />
 
-  <property name="test.target.dir" location="${target.dir}/test" />
-  <property name="test.classes.dir" location="${test.target.dir}/classes" />
-
   <property name="tools.dir" location="${base.dir}/tools" />
   <!--  <property name="antcontrib.dir" location="${tools.dir}/tools/ant/apache-ant-1.8.0/lib" />-->
   <property name="deploy.dir" location="${build.dir}/deploy" />
@@ -115,10 +111,6 @@
   <!-- directory for vmware-base library -->
   <property name="vmware-base.dir" location="${base.dir}/vmware-base" />
 
-  <!-- directories for testing -->
-  <property name="test.target.dir" location="${target.dir}/test" />
-  <property name="test.classes.dir" location="${test.target.dir}/classes" />
-
   <!-- directories for branding -->
   <property name="branding.dir" location="${build.dir}/deploy/branding/${branding.name}" />
 
diff --git a/build/build-tests.xml b/build/build-tests.xml
index 400465dde51..d0816cf2720 100755
--- a/build/build-tests.xml
+++ b/build/build-tests.xml
@@ -28,6 +28,7 @@
   <property name="tools.dist.dir" location="${dist.dir}/cloudapitools" />
 
   <property name="test.target.dir" location="${target.dir}/test" />
+  <property name="test.classes.dir" location="${test.target.dir}/classes"/>
 
   <property name="agent-simulator.jar" value="cloud-agent-simulator.jar" />
   <property name="testclient.jar" value="cloud-test.jar" />