Fixing failing timeout test

Moing to FakeWeb's default timeout mock, because it is more reliable
than mocha's way, and imitates the real situation more closely.
Merge branch 'fix-test-timeout' into develop