Fix some tests I broke. (More to follow.)
3 files changed