I am slowly refactoring the Spock tests to be more Spock-like