Add test for timeouts on timeout state
Make timeout state use standard state.add functions on personal
Make timeout state use standard state.add functions on chw
remove comments
Merge branch 'feature/issue-140-fix-restart-state-loop' into develop