Added spock framework for some tests