Use %z and fix test