Clear up test setup and stubbing HTTP calls
Update specs to use new RSpec syntax