added tests from Eyal