Add tests for and fix a circular dependency