bug fixes, ocra_parse refactoring, new test cases