Move Groovy test to correct directory
Fix dependencies for Spock/Groovy tests