added testing and refactored to make testing easier
Merge branch 'master' of github.com:kirillseva/twitterlive