[#75113956] spec for previous refactor