Add Docblocks and annotate unit test as #3719