clean-up call state machine spec a bit