Override rest server class, fix expectation

Override rest server class, fix expectation #154479