tests fully updated for spock and lizard