Additional conversion to and protobuf added for tests