Thats a problem of your tests. Go the classicist approach and your test don't fail after a significant refactoring.