improved spock tests