Fixed a few orphaned tests.