Merge "Update tests using app-id and app-data." into main