Fix up some tests broken in the rebase