Fixing minor leftover of a `__invoke` usage on a non-object
Fixing unit tests on generated code