Tests ok but not using yet splitting
Replacing former ctrl by new (splitting)
Fixing tests. Still some failing