Revert "Temporarily break a handful of tests." This reverts commit a921d550d03361353468f5d91d552d09ae92a60f.