RESTWS-333 Rewrite Tests