Merge "Move large test modules into separate files" into main