Update activity component and testcases following recent changes to service