Add yield_* expectations