Added more tests. Coverage - 58.1%