rspec-rails added
tests rewritten to rspec