I will do as you suggest. I think I will add assert at several other place for debugging purpose. 
I want to make test coverage = 100% and test all state machines changes.