Added two more circular dependency unit tests.