Update tests for #1794