Added more tests

-100% tests code coverage