Check with rubocop and fix tests
Missing variables added