updated for CSTester changes, fixed issue with YieldComplete not working as intended