Small improvements
Spock test class
Using Gradle