Test case 1-4 consistency update, data controller update, UML update and split testcase 1-4 to use ActivityInstrumentationTestCase2