Wip test fix for 9419