Update body test to match what's actually generated
Make Last Occurrence matcher less greedy