Circular dependencies handling + test