Fix specs after realizing that all the stubbed responses were incorrect,
and remove superfluous code