Update to Testcase and Main Activity