Fixed twitter tests.
Merge pull request #72 from teugis/master

Fixed twitter tests.
merge conflicts fixed