Added additional unit tests