update tests after marge from Ofer