Minor cleanup of some test junk.