Fixed unit tests related to format matching (2)