Added a lot of unit-tests and raised the code-coverage
Added more unit-tests