Fixed tests project issues
Merge remote-tracking branch 'origin/improvePerformance' into improvePerformance