Snapshot test tool: Write on diff only and minor enhancements.