Fixed up a buncha tests.