Fix failing Spock tests