D-12341 tweaking spock tests