updated Soheil's tests