fixing more tests with server message changes