Fix bug with Control.CurrentStage, improve staging tests