Merged with scrim_modifs done. Errors with test_signal don't manage do fix it