Refactored and reenabled tests that were disabled when moving to webservices.rest 2.0