fix diff tests and allow overriding via suplement