RSpec test

Migrated improved on rake tests to rspec