Resolve new Rubocop failures
Update test data