Test updated no forms
Added missing code for cycle detection