Update docblocks and tests