[aibt]
Fixed the rest of the composite logic to satisfy single tree tests