Rearranged rspec tests
Added