Updated spock and groovy versions and refactored tests to use with