added fix for Spock tests