Improved diff tests