Optimization tests on windows
Merged optimizations