Fix test that broke on rebase