Merge "Reduce time needed to run test." into main