Add tests to improve test covering
100% unit test covering