Copied over test that was lost during merge conflict