Update tests for #886 changes