CDI-2786 set normalized flattener as default. actualize tests