#6420: Update tests.