tried to fix tests for #3472