Revert little undesired change in tests
Removed trash from failed circular dependency detection attempt