Improve deployconfig generator diffing

Also improve the unit tests.