Fix Spec issues and Rubocop offenses