Remove some test cruft