Performance tweaks
Merge deploy tests
Work on tests performances
Fix extra output in tests