Added tests. Code coverage 100%