Improve tree expand promise tests to run fully
tree: Remove when call from query logic since we always have a promise