Clean out some test cruft