diff --git a/hapi-fhir-jpaserver-base/src/main/resources/.keep b/hapi-fhir-jpaserver-base/src/main/resources/.keep
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/hapi-fhir-jpaserver-base/src/main/resources/fhir-spring-config.xml b/hapi-fhir-jpaserver-base/src/main/resources/fhir-spring-config.xml
deleted file mode 100644
index a7ca95c6e86..00000000000
--- a/hapi-fhir-jpaserver-base/src/main/resources/fhir-spring-config.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:p="http://www.springframework.org/schema/p" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:task="http://www.springframework.org/schema/task" xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
-		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd
-	"
-	default-autowire="no" default-lazy-init="false">
-
-	<context:annotation-config />
-	<context:mbean-server />
-
-	<bean id="myPersistenceDataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource" lazy-init="true">
-		<property name="url" value="jdbc:derby:memory:myUnitTestDB;create=true" />
-	</bean>
-
-	<bean id="myPersistenceDataSource2" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close" lazy-init="true">
-		<!-- <property name="url" value="jdbc:hsqldb:mem:unit-testing-jpa"/>  -->
-		<!-- <property name="url" value="jdbc:hsqldb:file:svcret.hsqldb" /> -->
-		<property name="url" value="jdbc:derby:memory:myUnitTestDB;create=true" />
-		<!-- 
-		<property name="username" value="sa" />
-		<property name="password" value="" />
-		-->
-	</bean>
-
-	<bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
-		<property name="dataSource" ref="myPersistenceDataSource" />
-		<!-- <property name="persistenceUnitName" value="FHIR_UT" />  -->
-		<property name="jpaVendorAdapter">
-			<bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
-				<property name="showSql" value="false" />
-				<property name="generateDdl" value="true" />
-				<!-- <property name="databasePlatform" value="org.hibernate.dialect.HSQLDialect" />  -->
-				<property name="databasePlatform" value="ca.uhn.fhir.jpa.util.HapiDerbyTenSevenDialect" />
-			</bean>
-		</property>
-	</bean>
-
-	<bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
-		<property name="entityManagerFactory" ref="entityManagerFactory" />
-	</bean>
-
-	<tx:annotation-driven transaction-manager="transactionManager" />
-
-</beans>
\ No newline at end of file
diff --git a/hapi-fhir-jpaserver-base/src/main/resources/fhir-spring-search-config-dstu2.xml b/hapi-fhir-jpaserver-base/src/main/resources/fhir-spring-search-config-dstu2.xml
deleted file mode 100644
index 2e9740395a7..00000000000
--- a/hapi-fhir-jpaserver-base/src/main/resources/fhir-spring-search-config-dstu2.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<beans 
-	xmlns="http://www.springframework.org/schema/beans"
-	xmlns:context="http://www.springframework.org/schema/context" 
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-	xmlns:websocket="http://www.springframework.org/schema/websocket"
-	xmlns:task="http://www.springframework.org/schema/task"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xsi:schemaLocation="
-	     http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-        http://www.springframework.org/schema/websocket http://www.springframework.org/schema/websocket/spring-websocket.xsd
-        http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
-        http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd">
-
-	<context:annotation-config />
-
-	<tx:annotation-driven transaction-manager="myTxManagerDstu2" />
-	
-	<bean id="mySearchDaoDstu2" class="ca.uhn.fhir.jpa.dao.FhirSearchDao" />
-
-</beans>
\ No newline at end of file
diff --git a/hapi-fhir-jpaserver-base/src/main/resources/fhir-spring-subscription-config-dstu2.xml b/hapi-fhir-jpaserver-base/src/main/resources/fhir-spring-subscription-config-dstu2.xml
deleted file mode 100644
index f276526efe6..00000000000
--- a/hapi-fhir-jpaserver-base/src/main/resources/fhir-spring-subscription-config-dstu2.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<beans 
-	xmlns="http://www.springframework.org/schema/beans"
-	xmlns:context="http://www.springframework.org/schema/context" 
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-	xmlns:websocket="http://www.springframework.org/schema/websocket"
-	xmlns:task="http://www.springframework.org/schema/task"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xsi:schemaLocation="
-	     http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-        http://www.springframework.org/schema/websocket http://www.springframework.org/schema/websocket/spring-websocket.xsd
-        http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
-        http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd">
-
-	<context:annotation-config />
-
-	<websocket:handlers>
-		<websocket:mapping path="/websocket/dstu2" handler="mySubscriptionWebsocketHandler" />
-	</websocket:handlers>
-
-	<!-- 
-	<task:annotation-driven executor="myExecutor" scheduler="myScheduler"/>
-	-->
-
-	<bean id="mySubscriptionWebsocketHandler" class="org.springframework.web.socket.handler.PerConnectionWebSocketHandler">
-		<constructor-arg value="ca.uhn.fhir.jpa.subscription.SubscriptionWebsocketHandler"/>
-	</bean>
-	
-	<bean id="mySubscriptionSecurityInterceptor" class="ca.uhn.fhir.jpa.util.SubscriptionsRequireManualActivationInterceptor"/>
-
-	<tx:annotation-driven transaction-manager="myTxManagerDstu2" />
-
-</beans>
\ No newline at end of file
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/META-INF/persistence.xml b/hapi-fhir-jpaserver-base/src/test/resources/META-INF/persistence.xml
deleted file mode 100644
index 2497241c875..00000000000
--- a/hapi-fhir-jpaserver-base/src/test/resources/META-INF/persistence.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
-             version="2.0">
-
-	<persistence-unit name="FHIR_UT" transaction-type="RESOURCE_LOCAL">
-		<provider>org.hibernate.ejb.HibernatePersistence</provider>
-		<!-- <class>ca.uhn.fhir.jpa.entity.PatientResourceTable</class>  -->
-		
-		<class>ca.uhn.fhir.jpa.entity.ForcedId</class>
-		<class>ca.uhn.fhir.jpa.entity.ResourceTable</class>
-		<class>ca.uhn.fhir.jpa.entity.ResourceHistoryTable</class>
-		<class>ca.uhn.fhir.jpa.entity.ResourceHistoryTag</class>
-		<class>ca.uhn.fhir.jpa.entity.ResourceIndexedSearchParamDate</class>
-		<class>ca.uhn.fhir.jpa.entity.ResourceIndexedSearchParamNumber</class>
-		<class>ca.uhn.fhir.jpa.entity.ResourceIndexedSearchParamQuantity</class>
-		<class>ca.uhn.fhir.jpa.entity.ResourceIndexedSearchParamString</class>
-		<class>ca.uhn.fhir.jpa.entity.ResourceIndexedSearchParamToken</class>
-		<class>ca.uhn.fhir.jpa.entity.ResourceIndexedSearchParamUri</class>
-		<class>ca.uhn.fhir.jpa.entity.ResourceIndexedSearchParamCoords</class>
-		<class>ca.uhn.fhir.jpa.entity.ResourceLink</class>
-		<class>ca.uhn.fhir.jpa.entity.ResourceTag</class>
-		<class>ca.uhn.fhir.jpa.entity.Search</class>
-		<class>ca.uhn.fhir.jpa.entity.SearchResult</class>
-		<class>ca.uhn.fhir.jpa.entity.SubscriptionTable</class>
-		<class>ca.uhn.fhir.jpa.entity.SubscriptionFlaggedResource</class>
-		<class>ca.uhn.fhir.jpa.entity.TagDefinition</class>
-		
-		<exclude-unlisted-classes>false</exclude-unlisted-classes>
-		<properties>
-			<property name="hibernate.hbm2ddl.auto" value="update" />
-			<property name="hibernate.jdbc.batch_size" value="0" />
-			<property name="hibernate.cache.use_minimal_puts" value="false" />
-			<property name="hibernate.cache.use_query_cache" value="false" />
-			<property name="hibernate.cache.use_second_level_cache" value="false" />
-			<property name="hibernate.cache.use_structured_entries" value="false" />
-			<property name="hibernate.search.default.directory_provider" value="filesystem"/>
-			<property name="hibernate.search.default.indexBase" value="./target/lucene_indexes"/>
-			<property name="hibernate.search.lucene_version" value="LUCENE_CURRENT" />
-			<!-- 
-			<property name="hibernate.ejb.naming_strategy" value="ca.uhn.fhir.jpa.util.CustomNamingStrategy" />
-			 -->
-			<!-- 
-			<property name="hibernate.cache.region.factory_class" value="org.hibernate.cache.ehcache.SingletonEhCacheRegionFactory" />
-			 -->
-		</properties>                                                    
-	</persistence-unit>
-
-</persistence>
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/fhir-jpabase-spring-test-config.xml b/hapi-fhir-jpaserver-base/src/test/resources/fhir-jpabase-spring-test-config.xml
deleted file mode 100644
index 40801cb1284..00000000000
--- a/hapi-fhir-jpaserver-base/src/test/resources/fhir-jpabase-spring-test-config.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:p="http://www.springframework.org/schema/p" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:task="http://www.springframework.org/schema/task" xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
-		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd
-	"
-	default-autowire="no" default-lazy-init="false">
-
-	<context:annotation-config />
-	<context:mbean-server />
-
-	<bean id="myDaoConfig" class="ca.uhn.fhir.jpa.dao.DaoConfig">
-	</bean>
-
-
-	<bean id="myPersistenceDataSource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
-		<property name="driverClassName" value="org.apache.derby.jdbc.EmbeddedDriver"></property>
-		<property name="url" value="jdbc:derby:memory:myUnitTestDB;create=true" />
-		<property name="username" value=""/>
-		<property name="password" value=""/>
-	</bean>
-
-
-	<bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
-		<property name="dataSource" ref="myPersistenceDataSource" />
-		<property name="persistenceUnitName" value="FHIR_UT" />
-		<property name="jpaVendorAdapter">
-			<bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
-				<property name="showSql" value="false" />
-				<property name="generateDdl" value="true" />
-				<!-- <property name="databasePlatform" value="org.hibernate.dialect.HSQLDialect" />  -->
-				<property name="databasePlatform" value="ca.uhn.fhir.jpa.util.HapiDerbyTenSevenDialect" />
-			</bean>
-		</property>
-	</bean>
-	<bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
-		<property name="entityManagerFactory" ref="entityManagerFactory" />
-	</bean>
-	<tx:annotation-driven transaction-manager="transactionManager" />
-
-</beans>
diff --git a/hapi-fhir-jpaserver-example/pom.xml b/hapi-fhir-jpaserver-example/pom.xml
index 29e3f8c75f7..71a7762062c 100644
--- a/hapi-fhir-jpaserver-example/pom.xml
+++ b/hapi-fhir-jpaserver-example/pom.xml
@@ -61,6 +61,13 @@
 			<type>war</type>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-testpage-overlay</artifactId>
+			<version>1.3-SNAPSHOT</version>
+			<classifier>classes</classifier>
+			<scope>provided</scope>
+		</dependency>
 
 		<!-- HAPI-FHIR uses Logback for logging support. The logback library is included automatically by Maven as a part of the hapi-fhir-base dependency, but you also need to include a logging library. Logback 
 			is used here, but log4j would also be fine. -->
diff --git a/hapi-fhir-jpaserver-example/src/main/java/ca/uhn/fhir/jpa/demo/AppCtxConfig.java b/hapi-fhir-jpaserver-example/src/main/java/ca/uhn/fhir/jpa/demo/FhirServerConfig.java
similarity index 98%
rename from hapi-fhir-jpaserver-example/src/main/java/ca/uhn/fhir/jpa/demo/AppCtxConfig.java
rename to hapi-fhir-jpaserver-example/src/main/java/ca/uhn/fhir/jpa/demo/FhirServerConfig.java
index f013552be42..65b6f2c4bb0 100644
--- a/hapi-fhir-jpaserver-example/src/main/java/ca/uhn/fhir/jpa/demo/AppCtxConfig.java
+++ b/hapi-fhir-jpaserver-example/src/main/java/ca/uhn/fhir/jpa/demo/FhirServerConfig.java
@@ -23,7 +23,7 @@ import ca.uhn.fhir.rest.server.interceptor.LoggingInterceptor;
 
 @Configuration
 @EnableTransactionManagement()
-public class AppCtxConfig extends BaseJavaConfigDstu2 {
+public class FhirServerConfig extends BaseJavaConfigDstu2 {
 
 	/**
 	 * Configure FHIR properties around the the JPA server via this bean
diff --git a/hapi-fhir-jpaserver-example/src/main/java/ca/uhn/fhir/jpa/demo/FhirTesterConfig.java b/hapi-fhir-jpaserver-example/src/main/java/ca/uhn/fhir/jpa/demo/FhirTesterConfig.java
new file mode 100644
index 00000000000..947c46f9fa4
--- /dev/null
+++ b/hapi-fhir-jpaserver-example/src/main/java/ca/uhn/fhir/jpa/demo/FhirTesterConfig.java
@@ -0,0 +1,56 @@
+package ca.uhn.fhir.jpa.demo;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+import ca.uhn.fhir.context.FhirVersionEnum;
+import ca.uhn.fhir.to.FhirTesterMvcConfig;
+import ca.uhn.fhir.to.TesterConfig;
+
+//@formatter:off
+/**
+ * This spring config file configures the web testing module. It serves two
+ * purposes:
+ * 1. It imports FhirTesterMvcConfig, which is the spring config for the
+ *    tester itself
+ * 2. It tells the tester which server(s) to talk to, via the testerConfig()
+ *    method below
+ */
+@Configuration
+@Import(FhirTesterMvcConfig.class)
+public class FhirTesterConfig {
+
+	/**
+	 * This bean tells the testing webpage which servers it should configure itself
+	 * to communicate with. In this example we configure it to talk to the local
+	 * server, as well as one public server. If you are creating a project to 
+	 * deploy somewhere else, you might choose to only put your own server's 
+	 * address here.
+	 * 
+	 * Note the use of the ${serverBase} variable below. This will be replaced with
+	 * the base URL as reported by the server itself. Often for a simple Tomcat
+	 * (or other container) installation, this will end up being something
+	 * like "http://localhost:8080/hapi-fhir-jpaserver-example". If you are
+	 * deploying your server to a place with a fully qualified domain name, 
+	 * you might want to use that instead of using the variable.
+	 */
+	@Bean
+	public TesterConfig testerConfig() {
+		TesterConfig retVal = new TesterConfig();
+		retVal
+			.addServer()
+				.withId("home")
+				.withFhirVersion(FhirVersionEnum.DSTU2)
+				.withBaseUrl("${serverBase}/baseDstu2")
+				.withName("Local Tester")
+			.addServer()
+				.withId("hapi")
+				.withFhirVersion(FhirVersionEnum.DSTU2)
+				.withBaseUrl("http://fhirtest.uhn.ca/baseDstu2")
+				.withName("Public HAPI Test Server");
+		return retVal;
+	}
+	
+}
+//@formatter:on
diff --git a/hapi-fhir-jpaserver-example/src/main/java/ca/uhn/fhir/jpa/demo/JpaServerDemo.java b/hapi-fhir-jpaserver-example/src/main/java/ca/uhn/fhir/jpa/demo/JpaServerDemo.java
index b0a89460307..4e5c01cb738 100644
--- a/hapi-fhir-jpaserver-example/src/main/java/ca/uhn/fhir/jpa/demo/JpaServerDemo.java
+++ b/hapi-fhir-jpaserver-example/src/main/java/ca/uhn/fhir/jpa/demo/JpaServerDemo.java
@@ -124,7 +124,7 @@ public class JpaServerDemo extends RestfulServer {
 		setPagingProvider(new FifoMemoryPagingProvider(10));
 
 		/*
-		 * Load interceptors for the server from Spring (these are defined in AppCtxConfig.java)
+		 * Load interceptors for the server from Spring (these are defined in FhirServerConfig.java)
 		 */
 		Collection<IServerInterceptor> interceptorBeans = myAppCtx.getBeansOfType(IServerInterceptor.class).values();
 		for (IServerInterceptor interceptor : interceptorBeans) {
diff --git a/hapi-fhir-jpaserver-example/src/main/resources/META-INF/fhirtest_persistence.xml b/hapi-fhir-jpaserver-example/src/main/resources/META-INF/fhirtest_persistence.xml
deleted file mode 100644
index 3cf4e80f5f0..00000000000
--- a/hapi-fhir-jpaserver-example/src/main/resources/META-INF/fhirtest_persistence.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
-             version="2.0">
-
-	<persistence-unit name="FHIR_UT" transaction-type="RESOURCE_LOCAL">
-		<provider>org.hibernate.ejb.HibernatePersistence</provider>
-
-		<class>ca.uhn.fhir.jpa.entity.ForcedId</class>
-		<class>ca.uhn.fhir.jpa.entity.ResourceHistoryTable</class>
-		<class>ca.uhn.fhir.jpa.entity.ResourceHistoryTag</class>
-		<class>ca.uhn.fhir.jpa.entity.ResourceIndexedSearchParamDate</class>
-		<class>ca.uhn.fhir.jpa.entity.ResourceIndexedSearchParamNumber</class>
-		<class>ca.uhn.fhir.jpa.entity.ResourceIndexedSearchParamQuantity</class>
-		<class>ca.uhn.fhir.jpa.entity.ResourceIndexedSearchParamString</class>
-		<class>ca.uhn.fhir.jpa.entity.ResourceIndexedSearchParamToken</class>
-		<class>ca.uhn.fhir.jpa.entity.ResourceIndexedSearchParamUri</class>
-		<class>ca.uhn.fhir.jpa.entity.ResourceIndexedSearchParamCoords</class>
-		<class>ca.uhn.fhir.jpa.entity.ResourceLink</class>
-		<class>ca.uhn.fhir.jpa.entity.ResourceTable</class>
-		<class>ca.uhn.fhir.jpa.entity.ResourceTag</class>
-		<class>ca.uhn.fhir.jpa.entity.SubscriptionTable</class>
-		<class>ca.uhn.fhir.jpa.entity.SubscriptionFlaggedResource</class>
-		<class>ca.uhn.fhir.jpa.entity.Search</class>
-		<class>ca.uhn.fhir.jpa.entity.SearchResult</class>
-		<class>ca.uhn.fhir.jpa.entity.TagDefinition</class>
-		
-		<exclude-unlisted-classes>true</exclude-unlisted-classes>
-		<properties>
-			<property name="hibernate.hbm2ddl.auto" value="update" />
-			<property name="hibernate.jdbc.batch_size" value="0" />
-			<property name="hibernate.cache.use_minimal_puts" value="false" />
-			<property name="hibernate.show_sql" value="false" />
-			<property name="hibernate.cache.use_query_cache" value="false" />
-			<property name="hibernate.cache.use_second_level_cache" value="false" />
-			<property name="hibernate.cache.use_structured_entries" value="false" />
-		</properties>                                                    
-	</persistence-unit>
-
-</persistence>
diff --git a/hapi-fhir-jpaserver-example/src/main/webapp/WEB-INF/hapi-fhir-server-config.xml b/hapi-fhir-jpaserver-example/src/main/webapp/WEB-INF/hapi-fhir-server-config.xml
deleted file mode 100644
index 13219e8e020..00000000000
--- a/hapi-fhir-jpaserver-example/src/main/webapp/WEB-INF/hapi-fhir-server-config.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:p="http://www.springframework.org/schema/p" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:task="http://www.springframework.org/schema/task" xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
-		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd
-	"
-	default-autowire="no" default-lazy-init="false">
-
-	<context:annotation-config />
-	<context:mbean-server />
-
-	<bean id="myDaoConfig" class="ca.uhn.fhir.jpa.dao.DaoConfig">
-	</bean>
-
-	<bean id="myTxManager" class="org.springframework.orm.jpa.JpaTransactionManager">
-		<property name="entityManagerFactory" ref="entityManagerFactory" />
-	</bean>
-	<tx:annotation-driven transaction-manager="myTxManager" />
-
-	<util:list id="myServerInterceptors">
-		<ref bean="myLoggingInterceptor"/>
-	</util:list>
-	
-	<!-- 
-	Do some fancy logging to create a nice access log that has details
-	about each incoming request.
-	-->
-	<bean id="myLoggingInterceptor" class="ca.uhn.fhir.rest.server.interceptor.LoggingInterceptor">
-		<property name="loggerName" value="fhirtest.access"/>
-		<property name="messageFormat"
-				  value="Path[${servletPath}] Source[${requestHeader.x-forwarded-for}] Operation[${operationType} ${idOrResourceName}] UA[${requestHeader.user-agent}] Params[${requestParameters}]"/>
-	</bean>
-	
-</beans>
\ No newline at end of file
diff --git a/hapi-fhir-jpaserver-example/src/main/webapp/WEB-INF/hapi-fhir-server-database-config.xml b/hapi-fhir-jpaserver-example/src/main/webapp/WEB-INF/hapi-fhir-server-database-config.xml
deleted file mode 100644
index 6e9f1f4a0d0..00000000000
--- a/hapi-fhir-jpaserver-example/src/main/webapp/WEB-INF/hapi-fhir-server-database-config.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" xmlns:security="http://www.springframework.org/schema/security"
-	xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
-	xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd
-		http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.2.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd">
-
-	<!-- 
-	This file configures the database connection for the HAPI JPA Server.
-	-->
-
-	<!--
-	The following bean configures the database connection. The 'url' property value
-	of "jdbc:derby:directory:jpaserver_derby_files;create=true" indicates that the
-	server should save resources in a directory called "jpaserver_derby_files".
-	
-	A URL to a remote database could also be placed here, along with login credentials
-	and other properties supported by BasicDataSource.
-	-->
-	<bean id="myPersistenceDataSource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
-		<property name="url" value="jdbc:derby:directory:target/jpaserver_derby_files;create=true" />
-		<property name="driverClassName" value="org.apache.derby.jdbc.EmbeddedDriver"></property>
-		<property name="username" value=""/>
-		<property name="password" value=""/>
-	</bean>
-	
-	<!--
-	Hibernate can be configured with other dialects if you wish to connect to another
-	database (e.g. Postgres). Consult the Hibernate documentation to see a list of
-	available dialects. 
-	-->
-	<bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
-		<property name="dataSource" ref="myPersistenceDataSource" />
-		<property name="persistenceXmlLocation" value="classpath:META-INF/fhirtest_persistence.xml" />
-		<property name="persistenceUnitName" value="FHIR_UT" />
-		<property name="jpaVendorAdapter">
-			<bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
-				<property name="showSql" value="false" />
-				<property name="generateDdl" value="true" />
-				<property name="databasePlatform" value="ca.uhn.fhir.jpa.util.HapiDerbyTenSevenDialect" />
-			</bean>
-		</property>
-	</bean>
-
-</beans>
diff --git a/hapi-fhir-jpaserver-example/src/main/webapp/WEB-INF/hapi-fhir-tester-config.xml b/hapi-fhir-jpaserver-example/src/main/webapp/WEB-INF/hapi-fhir-tester-config.xml
deleted file mode 100644
index d3a9223133f..00000000000
--- a/hapi-fhir-jpaserver-example/src/main/webapp/WEB-INF/hapi-fhir-tester-config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans" 
-	xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" xmlns:security="http://www.springframework.org/schema/security"
-	xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
-	xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd
-		http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.2.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd">
-
-	<bean class="ca.uhn.fhir.to.TesterConfig">
-		<property name="servers">
-			<list>
-				<value>home     , DSTU2 , Local Server                 , ${serverBase}/baseDstu2</value>
-			</list>
-		</property>
-	</bean>
-
-	<bean id="fhirContext" class="ca.uhn.fhir.context.FhirContext" factory-method="forDstu2">
-	</bean>
-	
-</beans>
diff --git a/hapi-fhir-jpaserver-example/src/main/webapp/WEB-INF/web.xml b/hapi-fhir-jpaserver-example/src/main/webapp/WEB-INF/web.xml
index e04013d82c0..c81a6f602d0 100644
--- a/hapi-fhir-jpaserver-example/src/main/webapp/WEB-INF/web.xml
+++ b/hapi-fhir-jpaserver-example/src/main/webapp/WEB-INF/web.xml
@@ -1,10 +1,9 @@
-<web-app xmlns="http://java.sun.com/xml/ns/javaee" 
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-	version="3.0" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee ./xsd/web-app_3_0.xsd">
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.0"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee ./xsd/web-app_3_0.xsd">
 
 	<listener>
 		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>	
+	</listener>
 	<context-param>
 		<param-name>contextClass</param-name>
 		<param-value>
@@ -14,21 +13,22 @@
 	<context-param>
 		<param-name>contextConfigLocation</param-name>
 		<param-value>
-			ca.uhn.fhir.jpa.demo.AppCtxConfig
+			ca.uhn.fhir.jpa.demo.FhirServerConfig
 		</param-value>
 	</context-param>
 
-  <!-- Servlets -->
+	<!-- Servlets -->
 
 	<servlet>
 		<servlet-name>spring</servlet-name>
 		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+		<init-param>
+			<param-name>contextClass</param-name>
+			<param-value>org.springframework.web.context.support.AnnotationConfigWebApplicationContext</param-value>
+		</init-param>
 		<init-param>
 			<param-name>contextConfigLocation</param-name>
-			<param-value>
-				/WEB-INF/hapi-fhir-tester-application-context.xml
-				/WEB-INF/hapi-fhir-tester-config.xml
-			</param-value>
+			<param-value>ca.uhn.fhir.jpa.demo.FhirTesterConfig</param-value>
 		</init-param>
 		<load-on-startup>2</load-on-startup>
 	</servlet>
@@ -56,7 +56,7 @@
 		<servlet-name>spring</servlet-name>
 		<url-pattern>/</url-pattern>
 	</servlet-mapping>
-	
+
 
 
 	<!-- This filters provide support for Cross Origin Resource Sharing (CORS) -->
diff --git a/hapi-fhir-jpaserver-example/src/test/java/ca/uhn/fhir/jpa/demo/ExampleServerIT.java b/hapi-fhir-jpaserver-example/src/test/java/ca/uhn/fhir/jpa/demo/ExampleServerIT.java
index 452503162dc..afa2c580087 100644
--- a/hapi-fhir-jpaserver-example/src/test/java/ca/uhn/fhir/jpa/demo/ExampleServerIT.java
+++ b/hapi-fhir-jpaserver-example/src/test/java/ca/uhn/fhir/jpa/demo/ExampleServerIT.java
@@ -50,7 +50,7 @@ public class ExampleServerIT {
 		/*
 		 * This runs under maven, and I'm not sure how else to figure out the target directory from code..
 		 */
-		String path = ExampleServerIT.class.getClassLoader().getResource("whereami.txt").getPath();
+		String path = ExampleServerIT.class.getClassLoader().getResource(".keep_hapi-fhir-jpaserver-example").getPath();
 		path = new File(path).getParent();
 		path = new File(path).getParent();
 		path = new File(path).getParent();
diff --git a/hapi-fhir-jpaserver-example/src/test/resources/.keep_hapi-fhir-jpaserver-example b/hapi-fhir-jpaserver-example/src/test/resources/.keep_hapi-fhir-jpaserver-example
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/hapi-fhir-jpaserver-example/src/test/resources/whereami.txt b/hapi-fhir-jpaserver-example/src/test/resources/whereami.txt
deleted file mode 100644
index 3707c1a3228..00000000000
--- a/hapi-fhir-jpaserver-example/src/test/resources/whereami.txt
+++ /dev/null
@@ -1 +0,0 @@
-ust used for path resolution
\ No newline at end of file
diff --git a/hapi-fhir-testpage-overlay/pom.xml b/hapi-fhir-testpage-overlay/pom.xml
index ba763222506..74e7f9db993 100644
--- a/hapi-fhir-testpage-overlay/pom.xml
+++ b/hapi-fhir-testpage-overlay/pom.xml
@@ -48,14 +48,11 @@
 		<dependency>
 			<groupId>org.thymeleaf</groupId>
 			<artifactId>thymeleaf</artifactId>
-			<version>${thymeleaf-version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.thymeleaf</groupId>
 			<artifactId>thymeleaf-spring4</artifactId>
-			<version>${thymeleaf-version}</version>
 		</dependency>
-
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
@@ -203,6 +200,7 @@
 				<artifactId>maven-war-plugin</artifactId>
 				<configuration>
 					<attachClasses>true</attachClasses>
+					<failOnMissingWebXml>false</failOnMissingWebXml>
 				</configuration>
 			</plugin>
 		</plugins>
diff --git a/hapi-fhir-testpage-overlay/src/main/java/ca/uhn/fhir/to/FhirTesterMvcConfig.java b/hapi-fhir-testpage-overlay/src/main/java/ca/uhn/fhir/to/FhirTesterMvcConfig.java
new file mode 100644
index 00000000000..c38c7f10ffc
--- /dev/null
+++ b/hapi-fhir-testpage-overlay/src/main/java/ca/uhn/fhir/to/FhirTesterMvcConfig.java
@@ -0,0 +1,60 @@
+package ca.uhn.fhir.to;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.thymeleaf.spring4.SpringTemplateEngine;
+import org.thymeleaf.spring4.view.ThymeleafViewResolver;
+import org.thymeleaf.templateresolver.ServletContextTemplateResolver;
+
+import ca.uhn.fhir.to.mvc.AnnotationMethodHandlerAdapterConfigurer;
+
+@Configuration
+@EnableWebMvc
+@ComponentScan(basePackages = "ca.uhn.fhir.to")
+public class FhirTesterMvcConfig extends WebMvcConfigurerAdapter {
+
+	@Override
+	public void addResourceHandlers(ResourceHandlerRegistry theRegistry) {
+		theRegistry.addResourceHandler("/css/**").addResourceLocations("/css/");
+		theRegistry.addResourceHandler("/fa/**").addResourceLocations("/fa/");
+		theRegistry.addResourceHandler("/fonts/**").addResourceLocations("/fonts/");
+		theRegistry.addResourceHandler("/img/**").addResourceLocations("/img/");
+		theRegistry.addResourceHandler("/js/**").addResourceLocations("/js/");
+	}
+
+	@Bean
+	public ServletContextTemplateResolver templateResolver() {
+		ServletContextTemplateResolver templateResolver = new ServletContextTemplateResolver();
+		templateResolver.setPrefix("/WEB-INF/templates/");
+		templateResolver.setSuffix(".html");
+		templateResolver.setTemplateMode("HTML5");
+		templateResolver.setCharacterEncoding("UTF-8");
+		return templateResolver;
+	}
+
+	@Bean
+	public AnnotationMethodHandlerAdapterConfigurer annotationMethodHandlerAdapterConfigurer() {
+		return new AnnotationMethodHandlerAdapterConfigurer();
+	}
+
+	@Bean
+	public ThymeleafViewResolver viewResolver() {
+		ThymeleafViewResolver viewResolver = new ThymeleafViewResolver();
+		viewResolver.setTemplateEngine(templateEngine());
+		viewResolver.setCharacterEncoding("UTF-8");
+		return viewResolver;
+	}
+
+	@Bean
+	public SpringTemplateEngine templateEngine() {
+		SpringTemplateEngine templateEngine = new SpringTemplateEngine();
+		templateEngine.setTemplateResolver(templateResolver());
+
+		return templateEngine;
+	}
+
+}
diff --git a/hapi-fhir-testpage-overlay/src/main/java/ca/uhn/fhir/to/TesterConfig.java b/hapi-fhir-testpage-overlay/src/main/java/ca/uhn/fhir/to/TesterConfig.java
index b3670ddd475..df6d7146786 100644
--- a/hapi-fhir-testpage-overlay/src/main/java/ca/uhn/fhir/to/TesterConfig.java
+++ b/hapi-fhir-testpage-overlay/src/main/java/ca/uhn/fhir/to/TesterConfig.java
@@ -1,9 +1,12 @@
 package ca.uhn.fhir.to;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 
+import javax.annotation.PostConstruct;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
 import org.springframework.beans.factory.annotation.Required;
@@ -20,6 +23,26 @@ public class TesterConfig {
 	private LinkedHashMap<String, FhirVersionEnum> myIdToFhirVersion = new LinkedHashMap<String, FhirVersionEnum>();
 	private LinkedHashMap<String, String> myIdToServerBase = new LinkedHashMap<String, String>();
 	private LinkedHashMap<String, String> myIdToServerName = new LinkedHashMap<String, String>();
+	private List<ServerBuilder> myServerBuilders = new ArrayList<TesterConfig.ServerBuilder>();
+
+	public IServerBuilderStep1 addServer() {
+		ServerBuilder retVal = new ServerBuilder();
+		return retVal;
+	}
+
+	@PostConstruct
+	public void build() {
+		for (ServerBuilder next : myServerBuilders) {
+			Validate.notBlank(next.myId, "Found invalid server configuration - No ID supplied");
+			Validate.notNull(next.myVersion, "Found invalid server configuration - No FHIR version supplied");
+			Validate.notBlank(next.myBaseUrl, "Found invalid server configuration - No base URL supplied");
+			Validate.notBlank(next.myName, "Found invalid server configuration - No name supplied");
+			myIdToFhirVersion.put(next.myId, next.myVersion);
+			myIdToServerBase.put(next.myId, next.myBaseUrl);
+			myIdToServerName.put(next.myId, next.myName);
+		}
+		myServerBuilders.clear();
+	}
 
 	public ITestingUiClientFactory getClientFactory() {
 		return myClientFactory;
@@ -58,7 +81,7 @@ public class TesterConfig {
 
 		for (String nextRaw : servers) {
 			String[] nextSplit = nextRaw.split(",");
-			
+
 			if (nextSplit.length < 3) {
 				throw new IllegalArgumentException("Invalid serveer line '" + nextRaw + "' - Must be comma separated");
 			} else if (nextSplit.length == 3) {
@@ -80,4 +103,78 @@ public class TesterConfig {
 		}
 	}
 
+	public interface IServerBuilderStep1 {
+
+		IServerBuilderStep2 withId(String theId);
+
+	}
+
+	public interface IServerBuilderStep2 {
+
+		IServerBuilderStep3 withFhirVersion(FhirVersionEnum theVersion);
+
+	}
+
+	public interface IServerBuilderStep3 {
+
+		IServerBuilderStep4 withBaseUrl(String theBaseUrl);
+
+	}
+
+	public interface IServerBuilderStep4 {
+
+		IServerBuilderStep5 withName(String theName);
+
+	}
+
+	public interface IServerBuilderStep5 {
+
+		IServerBuilderStep1 addServer();
+
+	}
+
+	public class ServerBuilder implements IServerBuilderStep1, IServerBuilderStep2, IServerBuilderStep3, IServerBuilderStep4, IServerBuilderStep5 {
+
+		private String myBaseUrl;
+		private String myId;
+		private String myName;
+		private FhirVersionEnum myVersion;
+
+		@Override
+		public IServerBuilderStep1 addServer() {
+			ServerBuilder retVal = new ServerBuilder();
+			myServerBuilders.add(retVal);
+			return retVal;
+		}
+
+		@Override
+		public IServerBuilderStep4 withBaseUrl(String theBaseUrl) {
+			Validate.notBlank(theBaseUrl, "theBaseUrl can not be blank");
+			myBaseUrl = theBaseUrl;
+			return this;
+		}
+
+		@Override
+		public IServerBuilderStep3 withFhirVersion(FhirVersionEnum theVersion) {
+			Validate.notNull(theVersion);
+			myVersion = theVersion;
+			return this;
+		}
+
+		@Override
+		public IServerBuilderStep2 withId(String theId) {
+			Validate.notBlank(theId, "theId can not be blank");
+			myId = theId;
+			return this;
+		}
+
+		@Override
+		public IServerBuilderStep5 withName(String theName) {
+			Validate.notBlank(theName, "theName can not be blank");
+			myName = theName;
+			return this;
+		}
+
+	}
+
 }
diff --git a/hapi-fhir-testpage-overlay/src/main/java/ca/uhn/fhir/to/mvc/AnnotationMethodHandlerAdapterConfigurer.java b/hapi-fhir-testpage-overlay/src/main/java/ca/uhn/fhir/to/mvc/AnnotationMethodHandlerAdapterConfigurer.java
index 38a00b79c23..63fd0e56718 100644
--- a/hapi-fhir-testpage-overlay/src/main/java/ca/uhn/fhir/to/mvc/AnnotationMethodHandlerAdapterConfigurer.java
+++ b/hapi-fhir-testpage-overlay/src/main/java/ca/uhn/fhir/to/mvc/AnnotationMethodHandlerAdapterConfigurer.java
@@ -1,5 +1,7 @@
 package ca.uhn.fhir.to.mvc;
 
+import javax.annotation.PostConstruct;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
 
@@ -7,6 +9,7 @@ public class AnnotationMethodHandlerAdapterConfigurer {
 	@Autowired
 	private RequestMappingHandlerAdapter adapter;
 
+	@PostConstruct
 	public void init() {
 		adapter.setWebBindingInitializer(new ToBindingInitializer());
 	}
diff --git a/hapi-fhir-testpage-overlay/src/main/webapp/WEB-INF/hapi-fhir-tester-config.xml b/hapi-fhir-testpage-overlay/src/main/webapp/WEB-INF/hapi-fhir-tester-config.xml
deleted file mode 100644
index c0fb3ef2ed0..00000000000
--- a/hapi-fhir-testpage-overlay/src/main/webapp/WEB-INF/hapi-fhir-tester-config.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" xmlns:security="http://www.springframework.org/schema/security"
-	xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
-	xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd
-		http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.2.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd">
-
-	<bean class="ca.uhn.fhir.to.TesterConfig">
-		<property name="servers">
-			<list>
-				<value>home     , DSTU1 , Localhost Server DSTU1          , http://localhost:8887/fhir/contextDstu1</value>
-				<value>home_d2  , DSTU2 , Localhost Server DSTU2          , http://localhost:8887/fhir/contextDstu2</value>
-				<value>hi       , DSTU1 , Health Intersections            , http://fhir.healthintersections.com.au/open</value>
-				<value>furore   , DSTU1 , Spark - Furore Reference Server , http://spark.furore.com/fhir</value>
-				<value>blaze    , DSTU1 , Blaze (Orion Health)            , https://fhir.orionhealth.com/blaze/fhir</value>
-				<value>oridashi , DSTU1 , Oridashi                        , http://demo.oridashi.com.au:8190</value>
-				<value>fhirbase , DSTU1 , FHIRPlace (Health Samurai)      , http://try-fhirplace.hospital-systems.com/ </value>
-			</list>
-		</property>
-	</bean>
-
-	<bean id="fhirContext" class="ca.uhn.fhir.context.FhirContext">
-	</bean>
-</beans>
\ No newline at end of file
diff --git a/hapi-fhir-testpage-overlay/src/main/webapp/WEB-INF/web.xml b/hapi-fhir-testpage-overlay/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 63e8889c723..00000000000
--- a/hapi-fhir-testpage-overlay/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
-
-	<!-- Creates the Spring Container shared by all Servlets and Filters -->
-	<listener>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
-
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>
-			/WEB-INF/hapi-fhir-tester-application-context.xml
-			/WEB-INF/hapi-fhir-tester-config.xml
-		</param-value>
-	</context-param>
-
-	<!-- Processes application requests -->
-	<servlet>
-		<servlet-name>spring</servlet-name>
-		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-		<init-param>
-			<param-name>contextConfigLocation</param-name>
-			<param-value>
-				/WEB-INF/hapi-fhir-tester-application-context.xml
-				/WEB-INF/hapi-fhir-tester-config.xml
-			</param-value>
-		</init-param>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>spring</servlet-name>
-		<url-pattern>/</url-pattern>
-	</servlet-mapping>
-
-	<jsp-config>
-		<jsp-property-group>
-			<url-pattern>*.jsp</url-pattern>
-			<trim-directive-whitespaces>true</trim-directive-whitespaces>
-		</jsp-property-group>
-	</jsp-config>
-
-</web-app>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 96340a6dbd0..1f35f6c4c54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -233,7 +233,7 @@
 		<mitreid-connect-version>1.1.8</mitreid-connect-version>
 		<phloc_schematron_version>2.7.1</phloc_schematron_version>
 		<phloc_commons_version>4.3.6</phloc_commons_version>
-		<spring_version>4.2.1.RELEASE</spring_version>
+		<spring_version>4.2.2.RELEASE</spring_version>
 		<thymeleaf-version>2.1.4.RELEASE</thymeleaf-version>
 		<ebay_cors_filter_version>1.0.1</ebay_cors_filter_version>
 		<xmlunit_version>1.6</xmlunit_version>
@@ -333,7 +333,7 @@
 			<dependency>
 				<groupId>org.apache.commons</groupId>
 				<artifactId>commons-lang3</artifactId>
-				<version>3.3.2</version>
+				<version>3.4</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.derby</groupId>
@@ -575,6 +575,11 @@
 				<artifactId>thymeleaf</artifactId>
 				<version>${thymeleaf-version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.thymeleaf</groupId>
+				<artifactId>thymeleaf-spring4</artifactId>
+				<version>${thymeleaf-version}</version>
+			</dependency>
 			<dependency>
 				<groupId>xmlunit</groupId>
 				<artifactId>xmlunit</artifactId>
@@ -626,7 +631,7 @@
 						<dependency>
 							<groupId>org.codehaus.plexus</groupId>
 							<artifactId>plexus-compiler-javac-errorprone</artifactId>
-							<version>2.5</version>
+							<version>2.6</version>
 						</dependency>
 					</dependencies>
 				</plugin>
@@ -1312,7 +1317,7 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>findbugs-maven-plugin</artifactId>
-						<version>3.0.0</version>
+						<version>3.0.2</version>
 						<configuration>
 							<classFilesDirectory>./hapi-fhir-base/target/classes</classFilesDirectory>
 						</configuration>
diff --git a/restful-server-example/pom.xml b/restful-server-example/pom.xml
index aa9dccc6af2..3a1483d0998 100644
--- a/restful-server-example/pom.xml
+++ b/restful-server-example/pom.xml
@@ -52,6 +52,13 @@
 			<type>war</type>
 			<scope>provided</scope>		
 		</dependency>
+		<dependency>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-testpage-overlay</artifactId>
+			<version>1.3-SNAPSHOT</version>
+			<classifier>classes</classifier>
+			<scope>provided</scope>		
+		</dependency>
 
 		<!-- 
 		HAPI-FHIR uses Logback for logging support. The logback library is included 
@@ -129,7 +136,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.1</version>
+				<version>3.3</version>
 				<configuration>
 					<source>1.6</source>
 					<target>1.6</target>
diff --git a/restful-server-example/src/main/java/ca/uhn/example/config/FhirTesterConfig.java b/restful-server-example/src/main/java/ca/uhn/example/config/FhirTesterConfig.java
new file mode 100644
index 00000000000..61b13d577ad
--- /dev/null
+++ b/restful-server-example/src/main/java/ca/uhn/example/config/FhirTesterConfig.java
@@ -0,0 +1,56 @@
+package ca.uhn.example.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+import ca.uhn.fhir.context.FhirVersionEnum;
+import ca.uhn.fhir.to.FhirTesterMvcConfig;
+import ca.uhn.fhir.to.TesterConfig;
+
+//@formatter:off
+/**
+ * This spring config file configures the web testing module. It serves two
+ * purposes:
+ * 1. It imports FhirTesterMvcConfig, which is the spring config for the
+ *    tester itself
+ * 2. It tells the tester which server(s) to talk to, via the testerConfig()
+ *    method below
+ */
+@Configuration
+@Import(FhirTesterMvcConfig.class)
+public class FhirTesterConfig {
+
+	/**
+	 * This bean tells the testing webpage which servers it should configure itself
+	 * to communicate with. In this example we configure it to talk to the local
+	 * server, as well as one public server. If you are creating a project to 
+	 * deploy somewhere else, you might choose to only put your own server's 
+	 * address here.
+	 * 
+	 * Note the use of the ${serverBase} variable below. This will be replaced with
+	 * the base URL as reported by the server itself. Often for a simple Tomcat
+	 * (or other container) installation, this will end up being something
+	 * like "http://localhost:8080/hapi-fhir-jpaserver-example". If you are
+	 * deploying your server to a place with a fully qualified domain name, 
+	 * you might want to use that instead of using the variable.
+	 */
+	@Bean
+	public TesterConfig testerConfig() {
+		TesterConfig retVal = new TesterConfig();
+		retVal
+			.addServer()
+				.withId("home")
+				.withFhirVersion(FhirVersionEnum.DSTU2)
+				.withBaseUrl("${serverBase}/fhir")
+				.withName("Local Tester")
+			.addServer()
+				.withId("hapi")
+				.withFhirVersion(FhirVersionEnum.DSTU2)
+				.withBaseUrl("http://fhirtest.uhn.ca/baseDstu2")
+				.withName("Public HAPI Test Server");
+		return retVal;
+	}
+	
+}
+//@formatter:on
diff --git a/restful-server-example/src/main/webapp/WEB-INF/hapi-fhir-tester-config.xml b/restful-server-example/src/main/webapp/WEB-INF/hapi-fhir-tester-config.xml
deleted file mode 100644
index 2272b7bafa7..00000000000
--- a/restful-server-example/src/main/webapp/WEB-INF/hapi-fhir-tester-config.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" xmlns:security="http://www.springframework.org/schema/security"
-	xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
-	xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd
-		http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.2.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd">
-
-	<!-- 
-	The following bean supplies any configuration to the
-	FHIR Tester application.
-	-->
-	<bean class="ca.uhn.fhir.to.TesterConfig">
-		<property name="servers">
-			<list>
-				<!-- Each value is a reference to one FHIR server -->
-				<!-- Format is:    [id],[FHIR version: DSTU1|DSTU2],[name],[base URL] -->
-				<!-- The URL should be customized to match the base URL for the FHIR endpoint -->
-				<value>example , DSTU1 , Restful Server Example , http://localhost:8080/fhir</value>
-			</list>
-		</property>
-		
-		<!--
-		Add a property for the client factory if one is needed 
-		<property name="clientFactory"><bean class="com.example.AuthorizingTesterUiClientFactory"/></property>
-		-->
-	</bean>
-	
-	<!-- A FhirContext bean is also required -->
-	<bean id="fhirContext" class="ca.uhn.fhir.context.FhirContext">
-	</bean>
-	
-</beans>
\ No newline at end of file
diff --git a/restful-server-example/src/main/webapp/WEB-INF/web.xml b/restful-server-example/src/main/webapp/WEB-INF/web.xml
index 88020ad1d40..319bfa280f1 100644
--- a/restful-server-example/src/main/webapp/WEB-INF/web.xml
+++ b/restful-server-example/src/main/webapp/WEB-INF/web.xml
@@ -1,26 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app version="2.5">
 
-	<!-- The following entries are all here to enable the tester web application, and are not actually a part of the underlying FHIR server. -->
-	<listener>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>
-			/WEB-INF/hapi-fhir-tester-application-context.xml
-			/WEB-INF/hapi-fhir-tester-config.xml
-		</param-value>
-	</context-param>
+	<!-- 
+	This servlet is for the testing webpage, which is imported via
+	the hapi-fhir-testpage-overlay Maven WAR overlay
+	-->	
 	<servlet>
 		<servlet-name>spring</servlet-name>
 		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+		<init-param>
+			<param-name>contextClass</param-name>
+			<param-value>org.springframework.web.context.support.AnnotationConfigWebApplicationContext</param-value>
+		</init-param>
 		<init-param>
 			<param-name>contextConfigLocation</param-name>
-			<param-value>
-				/WEB-INF/hapi-fhir-tester-application-context.xml
-				/WEB-INF/hapi-fhir-tester-config.xml
-			</param-value>
+			<param-value>ca.uhn.example.config.FhirTesterConfig</param-value>
 		</init-param>
 		<load-on-startup>2</load-on-startup>
 	</servlet>
@@ -29,7 +23,23 @@
 		<url-pattern>/tester/*</url-pattern>
 	</servlet-mapping>
 
-	<!-- This filters provide support for Cross Origin Resource Sharing (CORS) -->
+	<!-- 
+	This is the actual FHIR server
+	-->
+	<servlet>
+		<servlet-name>fhirServlet</servlet-name>
+		<servlet-class>ca.uhn.example.servlet.ExampleRestfulServlet</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>fhirServlet</servlet-name>
+		<url-pattern>/fhir/*</url-pattern>
+	</servlet-mapping>
+
+	<!-- 
+	This filters provide support for Cross Origin Resource Sharing (CORS). You 
+	do not need this if you do not wish to support CORS in your own server. 
+	-->
 	<filter>
 		<filter-name>CORS Filter</filter-name>
 		<filter-class>org.ebaysf.web.cors.CORSFilter</filter-class>
@@ -74,16 +84,4 @@
 		<url-pattern>/*</url-pattern>
 	</filter-mapping>
 
-
-	<!-- The following entries are for the actual underlying FHIR server. -->
-	<servlet>
-		<servlet-name>fhir</servlet-name>
-		<servlet-class>ca.uhn.example.servlet.ExampleRestfulServlet</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>fhir</servlet-name>
-		<url-pattern>/fhir/*</url-pattern>
-	</servlet-mapping>
-
-
 </web-app>
\ No newline at end of file
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 4c7fe9e42cc..17f868d19e7 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -12,7 +12,8 @@
             latest versions (dependent HAPI modules listed in brackets):
             <![CDATA[
                <ul>
-                  <li>Springframework (JPA, Web Tester): 4.1.5 -&gt; 4.2.1</li>
+                  <li>Commons-lang3 (Core): 3.3.2 -&gt; 3.4</li>
+                  <li>Springframework (JPA, Web Tester): 4.1.5 -&gt; 4.2.2</li>
                   <li>Hibernate (JPA, Web Tester): 4.2.17 -&gt; 5.0.2</li>
                   <li>Hibernate Validator (JPA, Web Tester): 5.2.1 -&gt; 5.2.2</li>
                   <li>Derby (JPA, CLI, Public Server): 10.11.1.1 -&gt; 10.12.1.1 </li>