Removed test cruft