Refactored StateMachine and StateMachineTest:

	Replaced std containers with typedef and shorter name
	Refactor test to less redundent code.