rspec and webmocks working
merge issues