more rubocop
fix test failures