This PR fixes header uniformity across all Draft files
This results in better organization of the tests, avoiding extremely big files.