Merge branch 'restore-twitter-api-tests' into 'develop'