Updating tests for #788