Rejigging unit tests