Spec improvements and upgrade to deal with new rest-client versions