WIP rubocop fixes
WIP test fixes