Fixed refactoring on tests
Merge branch '6.3.x' into 'BS-2683_DM_Compo'