added ocr test and reorganized