Fix broken tests.

Fix tests that got broken over time.