Code Style fixes (rubocop) + fix for unit tests