More test factoring