Added few more tests. Coverage - 60.3%