Merge "Remove constructors used exlusively for tests" into main