Improve and bug-fix normalizing item-item builder

This improves and bug-fixes the normalizing item-item model builder, and tests that an equivalent configuration produces identical output.