Improving performance
Unit tests to produce Performance comparable results
merge