Bug 23051: (follow-up) Add renewal feedback and move code to subroutines and test