Fix tests

- Fix TK who need berkshelf and fail without it
- Fix Rubocop latest rake integration