@happy-kitchen-89482 My recommendation would be Unions/covering the test files if they have Gets (I don't think there are that many). It would be good to seal the backends entirely from call-by-name, as I think core will end up being messier, with more circular dependencies, manual work, etc