More unittest performance improvements.
Merge pull request #120 from boudewijn-tribler/bugfixes

More unittest performance improvements.