Rspec tests
Fixed conflicts