Converted tests to use Spock