Removing Savon as dependency
Improving rspec generation