Fix tests broken while resolving change of formatting strings