FSM Test

Modified several FSM details and may need further discussion about this
part. Work need to be done about transition in FSM