Merge "Separate the extra tests to run in a separate job"