Add another workflow case (state pattern), minor fixes