Improve format test