Begin adding more FSM tests