All suggestions done except the new test file for target_format.