fix smoke tests based on new restrictions to adt