Fixed up tests related to my recent updates.