Do not relay on password setting to skip cleanup, add test for live testing