minor changes in Eyal's tests