Yes, just integrated your latest changes, will update this.

It's not a precise clone as I removed the dynamic generator-specific tests. I should do further refactoring on this to limit duplicated tests.