formatting and fix test file