[AC] Updated some functional tests to reflect conditional expectations in the 'then' step