Merge "Move text coretests to JUnit (2)" into oc-dev am: 2b0d0671b8
am: 411b7d9b5e

Change-Id: Ia5d517564c925debf882db0a3f976790a22a2f0f