Remove cruft from tests