Stage -> CurrentStage, add test