replace some e2e test by spock tests