Corrects some tests that the rebase seemed to break