diff --git a/wise-webapp/src/test/sql/hsql/test-data.sql b/config/database/hsql/atest-data.sql
similarity index 100%
rename from wise-webapp/src/test/sql/hsql/test-data.sql
rename to config/database/hsql/atest-data.sql
diff --git a/wise-webapp/src/test/sql/hsql/create-schemas.sql b/config/database/hsql/create-schemas.sql
similarity index 97%
rename from wise-webapp/src/test/sql/hsql/create-schemas.sql
rename to config/database/hsql/create-schemas.sql
index e80dbeaa..e2e41662 100644
--- a/wise-webapp/src/test/sql/hsql/create-schemas.sql
+++ b/config/database/hsql/create-schemas.sql
@@ -13,6 +13,7 @@ activation_code BIGINT NOT NULL,
 activation_date DATE,
 allow_send_email CHAR(1) NOT NULL,
 locale varchar(5),
+auth_schema INTEGER NOT NULL,
 FOREIGN KEY(colaborator_id) REFERENCES COLLABORATOR(id)
 );
 
@@ -69,5 +70,4 @@ user_id INTEGER NOT NULL,
 login_date date
 );
 
-COMMIT;
-SHUTDOWN;
\ No newline at end of file
+COMMIT;
\ No newline at end of file
diff --git a/wise-webapp/src/test/sql/hsql/drop-schemas.sql b/config/database/hsql/drop-schemas.sql
similarity index 95%
rename from wise-webapp/src/test/sql/hsql/drop-schemas.sql
rename to config/database/hsql/drop-schemas.sql
index e91e8e84..cf40ac87 100644
--- a/wise-webapp/src/test/sql/hsql/drop-schemas.sql
+++ b/config/database/hsql/drop-schemas.sql
@@ -7,4 +7,3 @@ DROP TABLE MINDMAP;
 DROP TABLE USER;
 DROP TABLE COLLABORATOR;
 COMMIT;
-SHUTDOWN;
\ No newline at end of file
diff --git a/wise-webapp/src/test/sql/mysql/3.0beta1-to-v3.0GA.sql b/config/database/mysql/3.0beta1-to-v3.0GA.sql
similarity index 100%
rename from wise-webapp/src/test/sql/mysql/3.0beta1-to-v3.0GA.sql
rename to config/database/mysql/3.0beta1-to-v3.0GA.sql
diff --git a/wise-webapp/src/test/sql/mysql/create-database.sql b/config/database/mysql/create-database.sql
similarity index 100%
rename from wise-webapp/src/test/sql/mysql/create-database.sql
rename to config/database/mysql/create-database.sql
diff --git a/wise-webapp/src/test/sql/mysql/create-schemas.sql b/config/database/mysql/create-schemas.sql
similarity index 100%
rename from wise-webapp/src/test/sql/mysql/create-schemas.sql
rename to config/database/mysql/create-schemas.sql
diff --git a/wise-webapp/src/test/sql/mysql/drop-schemas.sql b/config/database/mysql/drop-schemas.sql
similarity index 100%
rename from wise-webapp/src/test/sql/mysql/drop-schemas.sql
rename to config/database/mysql/drop-schemas.sql
diff --git a/wise-webapp/src/test/sql/mysql/test-data.sql b/config/database/mysql/test-data.sql
similarity index 100%
rename from wise-webapp/src/test/sql/mysql/test-data.sql
rename to config/database/mysql/test-data.sql
diff --git a/wise-webapp/src/test/sql/mysql/v2.0-to-v3.0.sql b/config/database/mysql/v2.0-to-v3.0.sql
similarity index 100%
rename from wise-webapp/src/test/sql/mysql/v2.0-to-v3.0.sql
rename to config/database/mysql/v2.0-to-v3.0.sql
diff --git a/wise-webapp/src/test/sql/postgres/create-database.sql b/config/database/postgres/create-database.sql
similarity index 100%
rename from wise-webapp/src/test/sql/postgres/create-database.sql
rename to config/database/postgres/create-database.sql
diff --git a/wise-webapp/src/test/sql/postgres/create-schemas.sql b/config/database/postgres/create-schemas.sql
similarity index 100%
rename from wise-webapp/src/test/sql/postgres/create-schemas.sql
rename to config/database/postgres/create-schemas.sql
diff --git a/wise-webapp/src/test/sql/postgres/drop-schemas.sql b/config/database/postgres/drop-schemas.sql
similarity index 100%
rename from wise-webapp/src/test/sql/postgres/drop-schemas.sql
rename to config/database/postgres/drop-schemas.sql
diff --git a/wise-webapp/pom.xml b/wise-webapp/pom.xml
index 0bb24374..ce9834a6 100644
--- a/wise-webapp/pom.xml
+++ b/wise-webapp/pom.xml
@@ -83,6 +83,12 @@
             <version>${org.springframework.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-openid</artifactId>
+            <version>${org.springframework.version}</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
@@ -343,50 +349,19 @@
                 <executions>
                     <execution>
                         <id>drop-schemas</id>
-                        <phase>test</phase>
+                        <phase>prepare-package</phase>
                         <goals>
                             <goal>execute</goal>
                         </goals>
                         <configuration>
                             <onError>continue</onError>
-                            <orderFile>ascending</orderFile>
+                            <orderFile>descending</orderFile>
                             <fileset>
                                 <basedir>${project.basedir}</basedir>
                                 <includes>
-                                    <include>src/test/sql/hsql/drop-schemas.sql</include>
-                                </includes>
-                            </fileset>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>create-schema</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                            <orderFile>ascending</orderFile>
-                            <fileset>
-                                <basedir>${project.basedir}</basedir>
-                                <includes>
-                                    <include>src/test/sql/hsql/create-schemas.sql</include>
-                                </includes>
-                            </fileset>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>create-data</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                            <orderFile>ascending</orderFile>
-                            <fileset>
-                                <basedir>${project.basedir}</basedir>
-                                <includes>
-                                    <include>src/test/sql/hsql/test-data.sql</include>
+                                    <include>config/database/hsql/drop-schemas.sql</include>
+                                    <include>config/database/hsql/create-schemas.sql</include>
+                                    <include>config/database/hsql/test-data.sql</include>
                                 </includes>
                             </fileset>
                         </configuration>
@@ -410,8 +385,6 @@
                     </includes>
                 </configuration>
             </plugin>
-
-
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
                 <version>2.1.1</version>