Add override support in cycle detection
Update tests