fixes for specs and updating the way we stub http