Shayan/fix tests