RESTWS-309: Fixed tests