Break out diff tests
Improved diff test