Change API and rspec tests