Testing/Rubocop updates