I'm not sure I understand what your dev process actually is. I get the impression that you're using the tests you write as a substitute for design work. Is that correct?
If so, I think that's the root of the trouble. Do your design work as a separate step that precedes writing test cases.