Fixed and test Twitter implementation as well