refactoring test to be a little more groovy
Merge branch 'refactoring.to.be.more.groovy'