[regularfry]

Pretty much, yes. TDD would say that if testing is painful, changing your design to take away that pain will leave you with a better design overall.