Add more test and update EFSM model