Fix trimming/minimize tests broken after recent refactor