hardening/add tests

Add new tests in order to increase the coverage testing.