diff --git a/Dockerfile b/Dockerfile
index 02cf4ff..079a4b1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,13 +10,13 @@ ENV TOMCAT_VERSION="6.0.35"
 
 ADD ./container_files /opt/
 COPY conf/grouper.conf /etc/httpd/conf.d/grouper.conf
-COPY conf/grouper.hibernate.properties /opt/grouper/$version
+COPY conf/grouper.hibernate.properties /opt/etc
 RUN rm /opt/grouper/2.3.0/grouper.apiBinary-2.3.0/conf/grouper.hibernate.properties && \
-    ln -s /opt/grouper/$version/grouper.hibernate.properties /opt/grouper/2.3.0/grouper.apiBinary-2.3.0/conf/grouper.hibernate.properties && \
+    ln -s /opt/etc/grouper.hibernate.properties /opt/grouper/2.3.0/grouper.apiBinary-2.3.0/conf/grouper.hibernate.properties && \
     rm /opt/grouper/2.3.0/grouper.ws-2.3.0/grouper-ws/build/dist/grouper-ws/WEB-INF/classes/grouper.hibernate.properties && \
-    ln -s /opt/grouper/$version/grouper.hibernate.properties /opt/grouper/2.3.0/grouper.ws-2.3.0/grouper-ws/build/dist/grouper-ws/WEB-INF/classes/grouper.hibernate.properties && \
+    ln -s /opt/etc/grouper.hibernate.properties /opt/grouper/2.3.0/grouper.ws-2.3.0/grouper-ws/build/dist/grouper-ws/WEB-INF/classes/grouper.hibernate.properties && \
     rm /opt/grouper/2.3.0/grouper.ui-2.3.0/dist/grouper/WEB-INF/classes/grouper.hibernate.properties && \
-    ln -s /opt/grouper/$version/grouper.hibernate.properties /opt/grouper/2.3.0/grouper.ui-2.3.0/dist/grouper/WEB-INF/classes/grouper.hibernate.properties
+    ln -s /opt/etc/grouper.hibernate.properties /opt/grouper/2.3.0/grouper.ui-2.3.0/dist/grouper/WEB-INF/classes/grouper.hibernate.properties
  
 VOLUME /opt/grouper/$version/apache-tomcat-$TOMCAT_VERSION/logs
 VOLUME /etc/httpd/logs
diff --git a/tests/image.bats b/tests/image.bats
new file mode 100644
index 0000000..f64d3b6
--- /dev/null
+++ b/tests/image.bats
@@ -0,0 +1,18 @@
+#!/usr/bin/env bats
+
+load ../common
+
+@test "Creates grouper properties" {
+  result="$(docker run -i $maintainer/$imagename ls /opt/etc/grouper.hibernate.properties)"
+  [ "$result" != '' ]
+}
+
+@test "Consumes first-run experience" {
+  result="$(docker run -i $maintainer/$imagename ls /tmp/firsttimerunning)"
+  [ "$result" != '' ]
+}
+
+@test "Contains java" {
+  run docker run -i $maintainer/$imagename which java
+  [ "$status" -eq 0 ]
+}
\ No newline at end of file