Test redundant helpers cleanup and rdoc update