Merge "Add additional unit tests and asserts for NS Heal."