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