Fixed rspec failing tests