Return 0 if sub tree not found and update tests