Unit-tested and corrected the current retireval for all the nodes