Merge "Update testActivity"