renamed back constant to terminal
terminals are processed through dispatcher, using undefined key
increased the complexity of the test