Fix tests which are no longer running.

Broken in 8737f4a.