[ test suit ] Removed unnecessary --injective-type-constructors option

(and some cosmetic changes)
Merge branch 'maint-2.4.0'