OP-421: Ensuring Test use Builder method to build new instances...