Updates docblocks and tests