Issue #234 Fix tests as they fail with master updates
Merge pull request #303 from DevYah/C3_MahmoudHashish_#234_fix_twitter_tests

Issue #234 Fix tests to pull up with master updates