Issue #29: More tests refactored to Spock