fix tests except ProtoBuffer