Added additional unit tests and increased the coverage