Unit test plus some documentation additions