Added some fixes and changes for FSM implementation + additional testing