Yeah, I'd been pondering the DRY aspects. But when I've done that kind of thing previously it ends up obfuscating the tests. I'll have a quick try of your transformation and see how it ends up ...