Significantly better heading tests.

Bug: 53481
Change-Id: I066239d07b54f25d44c4c87839d9b8d0a70d3ed7
Merge "Significantly better heading tests."