Unit tests work and factories are correctly generated.
merge conflicts