Update four more tests.

There's a lot that still need updating, but progress is good.