Improve unit test code coverage

Add mockery and improve statements code coverage