Fix diff output, add diff integration tests