[#52117673] Added tests to the cleanup