diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index e27d572d..a638df74 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -117,6 +117,12 @@
                         <include>**</include>
                     </includes>
                 </fileSet>
+                <fileSet filtered="true" packaged="false" encoding="UTF-8">
+                    <directory>src/test/resources</directory>
+                    <includes>
+                        <include>**</include>
+                    </includes>
+                </fileSet>
             </fileSets>
         </module>
 
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-share.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-share.xml
index d2ae9316..59f1d716 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-share.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-share.xml
@@ -12,17 +12,19 @@
     <Resources className="org.apache.naming.resources.VirtualDirContext"
                extraResourcePaths="/=${project.parent.basedir}/share-amp/target/share-amp/web" />
 
-    <!-- Configure where the Share (share.war) web application can load classes, test classes, and config -->
+    <!-- Configure where the Share (share.war) web application can load classes, config, and test classes (in that order) -->
     <!-- Setup the virtual class path like this:
-         1) target/classes
-         2) target/${project.build.finalName}/config
-         3) target/test-classes
+         1) share-amp/target/classes
+         2) share-amp/target/${project.build.finalName}/config
+         3) share-amp/target/test-classes
+         4)     Add other AMP paths here....
+         5) share/target/test-classes              (loads the share-config-custom.xml used during test runs)
 
          This way mvn compile can be invoked and all changes will be picked up
     -->
     <Loader className="org.apache.catalina.loader.VirtualWebappLoader"
             searchVirtualFirst="true"
-            virtualClasspath="${project.parent.basedir}/share-amp/target/classes;${project.parent.basedir}/share-amp/target/share-amp/config;${project.parent.basedir}/share-amp/target/test-classes" />
+            virtualClasspath="${project.parent.basedir}/share-amp/target/classes;${project.parent.basedir}/share-amp/target/share-amp/config;${project.parent.basedir}/share-amp/target/test-classes;${project.parent.basedir}/share/target/test-classes" />
 
     <!-- Load from all directories, not just when the META-INF directory is found in exploded JAR -->
     <JarScanner scanAllDirectories="true" />
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/pom.xml
index 4ddf84fc..0a72df74 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/pom.xml
@@ -23,9 +23,6 @@
              Allowed values: alfresco | share. In this case it's configured to use OOTB share -->
         <app.amp.client.war.artifactId>share</app.amp.client.war.artifactId>
 
-        <!-- Used in share-config-custom.xml. By default points to standard location of Alfresco Repository -->
-        <alfresco.repo.url>http://localhost:8080/alfresco</alfresco.repo.url>
-
         <!-- Defines the log level used in log4j.properties -->
         <app.log.root.level>WARN</app.log.root.level>
     </properties>
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml
index 6f816fc3..65ea050f 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml
@@ -13,6 +13,12 @@
         <version>${version}</version>
     </parent>
 
+    <properties>
+        <!-- Used in share-config-custom.xml when testing.
+             By default points to standard location (local) of Alfresco Repository -->
+        <alfresco.repo.url>http://localhost:8080/alfresco</alfresco.repo.url>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>${alfresco.groupId}</groupId>
diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/tomcat/context.xml b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/tomcat/context.xml
index 570c502a..58a995fa 100644
--- a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/tomcat/context.xml
+++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/tomcat/context.xml
@@ -11,7 +11,7 @@
   <Resources className="org.apache.naming.resources.VirtualDirContext"
     extraResourcePaths="/=${project.build.directory}/${project.build.finalName}/web" />
 
-
+  <!-- Configure where the Share (share.war) web application can load classes, test classes, and config -->
   <!-- Setup the virtual class path like this:
        1) target/classes
        2) target/${project.build.finalName}/config
diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml
index ea724ac1..a8163003 100644
--- a/poms/alfresco-sdk-parent/pom.xml
+++ b/poms/alfresco-sdk-parent/pom.xml
@@ -872,7 +872,10 @@
             </build>
         </profile>
 
-
+        <!--
+            Turn on webapp refresh for both Alfresco Repo (alfresco.war) and Alfresco Share (share.war)
+            if we find a module.properties file for an AMP extension.
+             -->
         <profile>
             <id>refresh-both</id>
             <activation>
@@ -900,8 +903,6 @@
         </profile>
 
 
-
-
         <!-- ====================================================================================================
               ONE OFF/SETUP operations
              ==================================================================================================== -->