Fix Rubocop warnings
Fix foodcritic warnings
Fix broken convergence tests