Started using twitter wrapper and added more tests
Fix merge conflict