Fix rest cucumber tests