Merge "Fix test failure from deprecated assert"