Refactor & Test : OcrServer