Added a few more tests. Coverage - 61.6%