Add block_collection overwrite test.
Fix header guard naming in blocks subdirectory.