Migrate to Spock