Change approach to 'shortest' formatting; fix tests.