Gem updates
Gem updates
Cleanup and helper test corrections.