tree: Rewrite and use old Runtime tests