Don't rely on setTimeout bugs + test cleanup

Should be `self`