[src][test] Changing matrix design a bit before going crazy into implementation