Converted all junit tests to Spock tests