Add some more helpful comments to docblocks
Fix HTML content tests