Added fns for sort-order and joins
Added new fns to the composed test