Merge "Move text coretests to JUnit (2)" into oc-dev