Rework fixes for #1051
Merge unit test
Oups