Fix rest tests