[#62586254] refactoring tests