Fix protobuf generation.
added more depth for TestReader.
Speed up file reader