Test rejigging