Expand doc blocks.
Fix failing test caused by renamed files.