fixed most of the rspec problem