Fix tests that Dan Broke