Circular dependencies are a huge pain. Making this change keeps making my test suite more and more complicated.