Improve pavement file, Split test file into several files