Change to Spock framework for Testing