Reworked Rspec tests