Remove dependencies on Spock for better version compatibility