fmt handle comments and rename test file