Refactoring to improve test coverage
Merge branch 'master' of github.com:fabioxgn/go-bot