Updated specs (still failling)  #35

Make the specs pass with the new webservices