safer prior detection and clean after tests