I feel your pain. I struggle with the tradeoff between code duplication in tests vs over-abstraction. I'm not sure a sweet spot exists. I've followed your suggestions for clarity.