Improve unittest runtime.
Merge pull request #119 from boudewijn-tribler/bugfixes

Improve unittest runtime.