Fixes in FSM Utilities; Tests.