Reworked project for performance tests