RSpec test

Migrated improved on rake tests to rspec
Line is too long. [85/80]