Int-3384: change format and fix broken test