Some performance tests
Merge fixed