Repaired a bunch of tests to reflect new reality.