Added additional unit test and some documentation