Merge "add NS test usecase"