RE: Cruft left behind by tests