move addField, addAlias and addCalcField from EntityTypeConstructor (prepare to drop those methods)
fix broken tests