Merge "add NS heal test usecase"