Functional tests fixed after protobuf refactoring/optimization