Turn expect macro into a function

Turn expect macro into a function #3199