Fix dialyzer error and common_test failure
Merge pull request #11 from jaynel/fsm-cleanup

Fix dialyzer error and common_test failure