cleanup of some tests