2.2.0 version commit

* Getting rid of thread sleeps in tests
* Added Xprovider getter, converter for future use
* Code clean up