Fix some tests for #1558