This is precisely the problem I alluded to which is solved by writing higher level tests with TDD that make fewer assumptions about your design.

TDD ought to let you make a bad design decision and then refactoring it while keeping the test as is.