Spock test enhancements