Update body test to match what's actually generated
Make Last Occurrence matcher less greedy
Merge pull request #36 from dmarkow/fix_count

"Count" row is wiped out during updates