Shayan/upstream add tests