Improve test performance
Merge pull request #1 from simonster/perf

Improve test performance