Amended #23617 -- Switch from the deprecated versions of the Assertion methods