@weltkante this change should mitigate the wacky HDC scoping issues we've been seeing in the tests- since you've been seeing this you might want to have a look at the caches I've introduced here to move everything to stack based scopes.