-- added Diff builder for generic diffs in tests
-- removed circular dependency
-- removed dagger