Revamp rspec tests