Split the file into several headers and added two test files