Add (useful) missing headlines to nvp unit test files

For Aaron Rosen's amusement, even though slightly ashamed.

Change-Id: Idadb7a86dddb2523987852179ebe23f6272846fb
Merge "Add (useful) missing headlines to nvp unit test files"