Adding unittests coverage
Improved unit tests coverage