Fix rest-gen tests