Fix unit tests since sequencing after trim was added.