Remove some cruft from tests.