Fix and cleanup performance test
Merge pull request #27 from karkum/fix-performance-test

Fix and cleanup performance test