Merge "Move test to "presubmit" group, it's already included like this in another location"