Merge "tests: Clean up file headers"