diff --git a/test/projects/geb/test/cucumber/step_definitions/Element_steps.groovy b/test/projects/geb/test/cucumber/step_definitions/Element_steps.groovy
index 26b7519..507c4ee 100644
--- a/test/projects/geb/test/cucumber/step_definitions/Element_steps.groovy
+++ b/test/projects/geb/test/cucumber/step_definitions/Element_steps.groovy
@@ -1,42 +1,14 @@
-/*
-* Copyright 2012 Martin Hauner
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
 import pages.ElementListPage
 import pages.ElementNewPage
 import pages.ElementShowPage
-import grails.plugin.cucumber.Element
 
 this.metaClass.mixin (cucumber.runtime.groovy.Hooks)
 this.metaClass.mixin (cucumber.runtime.groovy.EN)
 
 
-/*
-def createElement (String element) {
-    println "before save"
-    if (element == 'Gold') {
-        //new Element (atomicNumber: 79, name: 'Gold', symbol: 'Au').save ()
-    }
-    println "after save"
+Given (~'^\"([^\"]*)\" already exists$') { String element ->
+    ElementFactory.createElement (element)
 }
-*/
-
-
-//Given (~'^\"([^\"]*)\" already exists$') { String element ->
-    //createElement (element)
-//}
 
 Given (~'^I am in my laboratory$') { ->
     to ElementListPage
@@ -60,5 +32,5 @@ Then (~'^my element list contains \"([^\"]*)\"$') { String element ->
     to ElementListPage
     assert at (ElementListPage)
 
-    page.checkElement (element, 0)
+    page.checkElementAtRow (element, 0)
 }
diff --git a/test/projects/geb/test/cucumber/support/env.groovy b/test/projects/geb/test/cucumber/support/env.groovy
index 0a6f43b..5c282d2 100644
--- a/test/projects/geb/test/cucumber/support/env.groovy
+++ b/test/projects/geb/test/cucumber/support/env.groovy
@@ -7,15 +7,18 @@ this.metaClass.mixin (cucumber.runtime.groovy.EN)
 
 def bindingUpdater
 
+/*
+World {
+}
+*/
+
 Before () {
-    println "Before Hook"
+    ElementFactory.clearElements()
 
     bindingUpdater = new BindingUpdater (binding, new Browser ())
     bindingUpdater.initialize ()
 }
 
 After () {
-    println "After Hook"
-
     bindingUpdater.remove ()
 }
diff --git a/test/projects/geb/test/functional/ElementFactory.groovy b/test/projects/geb/test/functional/ElementFactory.groovy
new file mode 100644
index 0000000..3296587
--- /dev/null
+++ b/test/projects/geb/test/functional/ElementFactory.groovy
@@ -0,0 +1,16 @@
+import grails.plugin.cucumber.Element
+
+class ElementFactory {
+    static void createElement (String element) {
+        if (element == 'Gold') {
+            new Element (atomicNumber: 79, name: 'Gold', symbol: 'Au').save ()
+        }
+        else {
+            assert false
+        }
+    }
+
+    static void clearElements () {
+        Element.findAll()*.delete (flush: true)
+    }
+}
diff --git a/test/projects/geb/test/functional/pages/ElementListPage.groovy b/test/projects/geb/test/functional/pages/ElementListPage.groovy
index cd8c5ed..4b04269 100644
--- a/test/projects/geb/test/functional/pages/ElementListPage.groovy
+++ b/test/projects/geb/test/functional/pages/ElementListPage.groovy
@@ -29,7 +29,7 @@ class ElementListPage extends Page {
         }
     }
 
-    def checkElement (String element, int rowNumber) {
+    def checkElementAtRow (String element, int rowNumber) {
         if (element == "Gold") {
             assert row (rowNumber).id.number
             assert row (rowNumber).atomicNumber == "79"