Added unit tests to increasse coverage ;)