Fix specs
Fix rubocop warnings